diff options
| author | Nicolas Thill <nico@openwrt.org> | 2007-03-28 00:35:26 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2007-03-28 00:35:26 +0000 |
| commit | b5ecf6f203ae783e41bd66dff8adf351cf189e56 (patch) | |
| tree | d81132cca6f4e52af44f99c02a8bdcace7614854 | |
| parent | d143f05cfde0ba3962261916bb0ba679fc4a1421 (diff) | |
| download | master-187ad058-b5ecf6f203ae783e41bd66dff8adf351cf189e56.tar.gz master-187ad058-b5ecf6f203ae783e41bd66dff8adf351cf189e56.tar.bz2 master-187ad058-b5ecf6f203ae783e41bd66dff8adf351cf189e56.zip | |
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
| -rw-r--r-- | package/hostap-utils/Makefile | 2 | ||||
| -rw-r--r-- | package/hostapd/Makefile | 4 | ||||
| -rw-r--r-- | package/openswan/Makefile | 4 | ||||
| -rw-r--r-- | package/strongswan/Makefile | 4 | ||||
| -rw-r--r-- | package/wpa_supplicant/Makefile | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/package/hostap-utils/Makefile b/package/hostap-utils/Makefile index 7ed0fd9f5b..bac0d3f106 100644 --- 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 d200822e89..b77873c3ce 100644 --- 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 ea23caf0e2..d8f910becc 100644 --- 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 421c78c0c7..9993b3b034 100644 --- 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 fb11085cfb..6448145565 100644 --- 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 |