[package] replace some -I & -L flags with $(TARGET_CPPFLAGS) & $(TARGET_LDFLAGS)...

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

diff --git a/package/broadcom-57xx/Makefile b/package/broadcom-57xx/Makefile
index 172074c..ddbea78 100644 (file)
--- a/package/broadcom-57xx/Makefile
+++ b/package/broadcom-57xx/Makefile
@@ -28,9 +28,10 @@ define Build/Prepare
 endef
 
 ifeq ($(BOARD),brcm-2.4)
-       BUILDFLAGS = -DBCMDRIVER -I$(LINUX_DIR)/arch/mips/bcm947xx/include -I$(STAGING_DIR)/usr/include
-       BUILDFLAGS += -DDBG=0 -DBCM_PROC_FS=1 -DT3_JUMBO_RCV_RCB_ENTRY_COUNT=256 -DNICE_SUPPORT
-       BUILDFLAGS += -DPCIX_TARGET_WORKAROUND=1 -DINCLUDE_TBI_SUPPORT=1 -DINCLUDE_5701_AX_FIX=1
+  BUILDFLAGS := \
+       -DBCMDRIVER -I$(LINUX_DIR)/arch/mips/bcm947xx/include $(TARGET_CPPFLAGS) \
+       -DDBG=0 -DBCM_PROC_FS=1 -DT3_JUMBO_RCV_RCB_ENTRY_COUNT=256 -DNICE_SUPPORT \
+       -DPCIX_TARGET_WORKAROUND=1 -DINCLUDE_TBI_SUPPORT=1 -DINCLUDE_5701_AX_FIX=1
 endif
 
 define Build/Compile

diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index e49fc50..2cb511f 100644 (file)
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -161,7 +161,7 @@ define Build/Compile
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS) -I. -I$(PKG_BUILD_DIR)/include -Dlinux=1" \
                all
-       $(TARGET_CC) -o $(PKG_BUILD_DIR)/nas $(PKG_BUILD_DIR)/nas_exe.o -L$(STAGING_DIR)/usr/lib -lnvram $(PKG_BUILD_DIR)/router/shared/libshared.a
+       $(TARGET_CC) -o $(PKG_BUILD_DIR)/nas $(PKG_BUILD_DIR)/nas_exe.o $(TARGET_LDFLAGS) -lnvram $(PKG_BUILD_DIR)/router/shared/libshared.a
        $(TARGET_CC) -o $(PKG_BUILD_DIR)/wl $(PKG_BUILD_DIR)/wl_exe.o
 endef
 

diff --git a/package/ead/Makefile b/package/ead/Makefile
index df88c0f..115e68e 100644 (file)
--- a/package/ead/Makefile
+++ b/package/ead/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_PATH = tinysrp
 TARGET_CFLAGS += \
        -I$(PKG_BUILD_DIR) \
        -I$(PKG_BUILD_DIR)/tinysrp \
-       -I$(STAGING_DIR)/usr/include
+       $(TARGET_CPPFLAGS)
 
 MAKE_FLAGS += \
        CONFIGURE_ARGS="$(CONFIGURE_ARGS)" \

diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index a0da7a7..e4f3655 100644 (file)
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -94,11 +94,11 @@ define Build/ConfigureTarget
 endef
 
 define Build/CompileTarget
-       CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/madwifi -I$(STAGING_DIR)/usr/include/mac80211 -I$(STAGING_DIR)/usr/include/libnl -I$(STAGING_DIR)/usr/include" \
+       CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/madwifi -I$(STAGING_DIR)/usr/include/mac80211 -I$(STAGING_DIR)/usr/include/libnl $(TARGET_CPPFLAGS)" \
        $(MAKE) -C $(PKG_BUILD_DIR)/hostapd.$(1)/hostapd \
                $(TARGET_CONFIGURE_OPTS) \
                $(DRIVER_MAKEOPTS) \
-               LIBS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib \
+               LIBS="$(TARGET_LDFLAGS) \
                        $(if $(CONFIG_PACKAGE_kmod-mac80211),-lm $(STAGING_DIR)/usr/lib/libnl.a) \
                        $(if $(findstring default,$(1)),-lssl -lcrypto)" \
                hostapd hostapd_cli

diff --git a/package/iw/Makefile b/package/iw/Makefile
index e4878a0..6d9f09d 100644 (file)
--- a/package/iw/Makefile
+++ b/package/iw/Makefile
@@ -32,8 +32,8 @@ define Build/Configure
 endef
 
 MAKE_FLAGS += \
-       CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/mac80211 -I$(STAGING_DIR)/usr/include/libnl -I$(STAGING_DIR)/usr/include" \
-       LDFLAGS="-L$(STAGING_DIR)/usr/lib -lnl"
+       CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/mac80211 -I$(STAGING_DIR)/usr/include/libnl $(TARGET_CPPFLAGS)" \
+       LDFLAGS="$(TARGET_LDFLAGS) -lnl"
 
 ifneq ($(CONFIG_LINUX_2_6),)
   define Package/iw/install

diff --git a/package/opkg/Makefile b/package/opkg/Makefile
index 6a85790..8a06ec0 100644 (file)
--- a/package/opkg/Makefile
+++ b/package/opkg/Makefile
@@ -41,8 +41,8 @@ define Package/opkg/conffiles
 endef
 
 TARGET_CFLAGS += $(FPIC) $(if $(CONFIG_GCC_VERSION_4_3),-Wno-array-bounds)
-EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/lib
-EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
+EXTRA_CFLAGS += $(TARGET_CPPFLAGS)
+EXTRA_LDFLAGS += $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
 
 CONFIGURE_ARGS += \
        --disable-curl \

diff --git a/package/swconfig/Makefile b/package/swconfig/Makefile
index 0d86438..ae13436 100644 (file)
--- a/package/swconfig/Makefile
+++ b/package/swconfig/Makefile
@@ -23,7 +23,6 @@ define Package/swconfig
 endef
 
 TARGET_CPPFLAGS += \
-       -I$(STAGING_DIR)/usr/include \
        -I$(LINUX_DIR)/include \
        -I$(PKG_BUILD_DIR)
 

diff --git a/package/uci/Makefile b/package/uci/Makefile
index 49c3f42..6d1f7d9 100644 (file)
--- a/package/uci/Makefile
+++ b/package/uci/Makefile
@@ -53,7 +53,7 @@ UCI_MAKEOPTS = \
                COPTS="$(TARGET_CFLAGS)" \
                DEBUG="$(DEBUG)" \
                VERSION="$(UCI_VERSION)" \
-               CPPFLAGS="-I$(PKG_BUILD_DIR) -I$(STAGING_DIR)/usr/include" \
+               CPPFLAGS="-I$(PKG_BUILD_DIR) $(TARGET_CPPFLAGS)" \
                OS="Linux"
 
 # work around a nasty gcc bug