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
master
Nicolas Thill 2007-03-28 00:35:26 +00:00
parent d143f05cfd
commit b5ecf6f203
5 changed files with 9 additions and 9 deletions

View File

@ -28,7 +28,7 @@ endef
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -Wall" \ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -Wall" \
all all
endef endef

View File

@ -70,8 +70,8 @@ define Build/CompileTarget
$(MAKE) -C $(PKG_BUILD_DIR)_$(1) \ $(MAKE) -C $(PKG_BUILD_DIR)_$(1) \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
OPTFLAGS="$(TARGET_CFLAGS)" \ OPTFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/madwifi" \ CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/madwifi" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ LDFLAGS="$(TARGET_LDFLAGS)" \
hostapd hostapd_cli hostapd hostapd_cli
$(CP) $(PKG_BUILD_DIR)_$(1)/hostapd_cli $(PKG_BUILD_DIR)/ $(CP) $(PKG_BUILD_DIR)_$(1)/hostapd_cli $(PKG_BUILD_DIR)/
endef endef

View File

@ -54,7 +54,7 @@ PKG_MAKE_OPTS:= \
KERNELSRC="$(LINUX_DIR)" \ KERNELSRC="$(LINUX_DIR)" \
ARCH="$(LINUX_KARCH)" \ ARCH="$(LINUX_KARCH)" \
CROSS_COMPILE="$(TARGET_CROSS)" \ 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" \ IPSECDIR="/usr/lib/ipsec" \
INC_USRLOCAL="/usr" \ INC_USRLOCAL="/usr" \
@ -62,7 +62,7 @@ define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
$(PKG_MAKE_OPTS) \ $(PKG_MAKE_OPTS) \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ LDFLAGS="$(TARGET_LDFLAGS)" \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
programs module install programs module install
endef endef

View File

@ -57,7 +57,7 @@ PKG_MAKE_OPTS:= \
KERNELSRC="$(LINUX_DIR)" \ KERNELSRC="$(LINUX_DIR)" \
ARCH="$(LINUX_KARCH)" \ ARCH="$(LINUX_KARCH)" \
CROSS_COMPILE="$(TARGET_CROSS)" \ 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" \ IPSECDIR="/usr/lib/ipsec" \
INC_USRLOCAL="/usr" \ INC_USRLOCAL="/usr" \
@ -65,7 +65,7 @@ define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
$(PKG_MAKE_OPTS) \ $(PKG_MAKE_OPTS) \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ LDFLAGS="$(TARGET_LDFLAGS)" \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
programs module install programs module install
endef endef

View File

@ -47,8 +47,8 @@ define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
KERNEL=$(LINUX_DIR) \ KERNEL=$(LINUX_DIR) \
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ CPPFLAGS="$(TARGET_CPPFLAGS)" \
LDFLAGS=" -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ LDFLAGS="$(TARGET_LDFLAGS)" \
all all
$(STRIP) $(PKG_BUILD_DIR)/wpa_supplicant $(STRIP) $(PKG_BUILD_DIR)/wpa_supplicant
$(STRIP) $(PKG_BUILD_DIR)/wpa_cli $(STRIP) $(PKG_BUILD_DIR)/wpa_cli