replace common -I and -L search flags with TARGET_CPPFLAGS and TARGET_LDFLAGS

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6735 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/hostap-utils/Makefile b/package/hostap-utils/Makefile
index 7ed0fd9..bac0d3f 100644 (file)
--- a/package/hostap-utils/Makefile
+++ b/package/hostap-utils/Makefile
@@ -28,7 +28,7 @@ endef
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -Wall" \
+               CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -Wall" \
                all
 endef
 

diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index d200822..b77873c 100644 (file)
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -70,8 +70,8 @@ define Build/CompileTarget
        $(MAKE) -C $(PKG_BUILD_DIR)_$(1) \
                $(TARGET_CONFIGURE_OPTS) \
                OPTFLAGS="$(TARGET_CFLAGS)" \
-               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/madwifi" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+               CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/madwifi" \
+               LDFLAGS="$(TARGET_LDFLAGS)" \
                hostapd hostapd_cli
        $(CP) $(PKG_BUILD_DIR)_$(1)/hostapd_cli $(PKG_BUILD_DIR)/
 endef

diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index ea23caf..d8f910b 100644 (file)
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -54,7 +54,7 @@ PKG_MAKE_OPTS:= \
                KERNELSRC="$(LINUX_DIR)" \
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
-               USERCOMPILE="$(TARGET_CFLAGS) -I./linux/include -I$(STAGING_DIR)/usr/include -L$(STAGING_DIR)/usr/lib" \
+               USERCOMPILE="$(TARGET_CFLAGS) -I./linux/include $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \
                IPSECDIR="/usr/lib/ipsec" \
                INC_USRLOCAL="/usr" \
 
@@ -62,7 +62,7 @@ define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                $(PKG_MAKE_OPTS) \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+               LDFLAGS="$(TARGET_LDFLAGS)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                programs module install
 endef

diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile
index 421c78c..9993b3b 100644 (file)
--- a/package/strongswan/Makefile
+++ b/package/strongswan/Makefile
@@ -57,7 +57,7 @@ PKG_MAKE_OPTS:= \
                KERNELSRC="$(LINUX_DIR)" \
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
-               USERCOMPILE="$(TARGET_CFLAGS) -I./linux/include -I$(STAGING_DIR)/usr/include -L$(STAGING_DIR)/usr/lib" \
+               USERCOMPILE="$(TARGET_CFLAGS) -I./linux/include $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \
                IPSECDIR="/usr/lib/ipsec" \
                INC_USRLOCAL="/usr" \
 
@@ -65,7 +65,7 @@ define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                $(PKG_MAKE_OPTS) \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+               LDFLAGS="$(TARGET_LDFLAGS)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                programs module install
 endef

diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index fb11085..6448145 100644 (file)
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -47,8 +47,8 @@ define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \
                KERNEL=$(LINUX_DIR) \
-               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-               LDFLAGS=" -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+               CPPFLAGS="$(TARGET_CPPFLAGS)" \
+               LDFLAGS="$(TARGET_LDFLAGS)" \
                all
        $(STRIP) $(PKG_BUILD_DIR)/wpa_supplicant
        $(STRIP) $(PKG_BUILD_DIR)/wpa_cli