projects
/
openwrt
/
staging
/
florian.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
32490ca
)
replace common -I and -L search flags with TARGET_CPPFLAGS and TARGET_LDFLAGS
author
Nicolas Thill
<nico@openwrt.org>
Wed, 28 Mar 2007 00:35:26 +0000
(
00:35
+0000)
committer
Nicolas Thill
<nico@openwrt.org>
Wed, 28 Mar 2007 00:35:26 +0000
(
00:35
+0000)
SVN-Revision: 6735
package/hostap-utils/Makefile
patch
|
blob
|
history
package/hostapd/Makefile
patch
|
blob
|
history
package/openswan/Makefile
patch
|
blob
|
history
package/strongswan/Makefile
patch
|
blob
|
history
package/wpa_supplicant/Makefile
patch
|
blob
|
history
diff --git
a/package/hostap-utils/Makefile
b/package/hostap-utils/Makefile
index 7ed0fd9f5b65d39d95a7fa1a96e6f077da934c5f..bac0d3f106470b73a6270955078cf87bd1c9435d 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) \
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
all
endef
diff --git
a/package/hostapd/Makefile
b/package/hostapd/Makefile
index d200822e89f8e67639d2abd49824537ddee6fc0d..b77873c3ce5223e75fcbcd8ae643fc16c5be6765 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)" \
$(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
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 ea23caf0e248554165514c99a39e0dd05c303d38..d8f910beccc3cc8171ae010ae33b37eb8fce2acc 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)" \
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" \
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) \
$(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
DESTDIR="$(PKG_INSTALL_DIR)" \
programs module install
endef
diff --git
a/package/strongswan/Makefile
b/package/strongswan/Makefile
index 421c78c0c775c5e68d1738a8cb4b08b75fa3798f..9993b3b034b61ef3e768852b5f2003e041c4f890 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)" \
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" \
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) \
$(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
DESTDIR="$(PKG_INSTALL_DIR)" \
programs module install
endef
diff --git
a/package/wpa_supplicant/Makefile
b/package/wpa_supplicant/Makefile
index fb11085cfbc0064ccb5d7d31eb517a6b15525ca8..6448145565bf2ed0c25dfd78fe64cb5bbb7d2ded 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) \
$(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
all
$(STRIP) $(PKG_BUILD_DIR)/wpa_supplicant
$(STRIP) $(PKG_BUILD_DIR)/wpa_cli