From 3133fefe06562d0ce7984230425128634de27f2f Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 21 Jan 2007 02:14:50 +0000
Subject: pass the CFLAGS through the environment on compile and fix a few
 packages

SVN-Revision: 6154
---
 package/isakmpd/Makefile    | 10 ++++++----
 package/keynote/Makefile    |  6 +-----
 package/linux-atm/Makefile  |  7 ++++---
 package/util-linux/Makefile |  1 +
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'package')

diff --git a/package/isakmpd/Makefile b/package/isakmpd/Makefile
index 628b97f..d722052 100644
--- a/package/isakmpd/Makefile
+++ b/package/isakmpd/Makefile
@@ -32,11 +32,13 @@ define Package/isakmpd
 endef
 
 define Build/Compile
-	$(call Build/Compile/Default, \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
 		LINUX_DIR="$(LINUX_DIR)" \
-		EXTRA_CPPFLAGS="-I$(STAGING_DIR)/usr/include/openssl -I$(STAGING_DIR)/usr/include/keynote  -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-	)
+		EXTRA_CPPFLAGS="-I$(STAGING_DIR)/usr/include/openssl -I$(STAGING_DIR)/usr/include/keynote -I$(STAGING_DIR)/usr/include " \
+		EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib"
+
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		STAGING_DIR="$(STAGING_DIR)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
diff --git a/package/keynote/Makefile b/package/keynote/Makefile
index 5793004..ed4d4f0 100644
--- a/package/keynote/Makefile
+++ b/package/keynote/Makefile
@@ -42,11 +42,7 @@ define Build/Configure
 	)
 endef
 
-define Build/Compile
-	$(call Build/Compile/Default, \
-		CFLAGS="\$$$$(EXTRA_CFLAGS) \$$$$(EXTRA_LDFLAGS)" \
-	)
-endef
+EXTRA_CFLAGS += $(EXTRA_LDFLAGS)
 
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index 9aae0a0..7691c11 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -51,11 +51,12 @@ define Build/Configure
 	touch $(PKG_BUILD_DIR)/stamp-h.in
 endef
 
+TARGET_CFLAGS := -I$(PKG_BUILD_DIR)/src/include $(TARGET_CFLAGS)
 define Build/Compile
-	$(call Build/Compile/Default, \
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install \
-	)
+		all install
 endef
 
 define Build/InstallDev
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index e265edb..ecabbc0 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -56,6 +56,7 @@ define Package/swap-utils
 	- swapoff
 endef
 
+TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib
 define Build/Compile
 	$(call Build/Compile/Default, \
 		OPT="$(TARGET_CFLAGS)" \
-- 
cgit v1.1