qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-19 09:06:14 +02:00
Code

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

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14651 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2009-02-24 00:08:08 +00:00
parent e725ea66c7
commit f8b8f7c474
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/broadcom-57xx/Makefile
View File

@ -28,9 +28,10 @@ define Build/Prepare
endef endef
ifeq ($(BOARD),brcm-2.4) ifeq ($(BOARD),brcm-2.4)
BUILDFLAGS = -DBCMDRIVER -I$(LINUX_DIR)/arch/mips/bcm947xx/include -I$(STAGING_DIR)/usr/include BUILDFLAGS := \
BUILDFLAGS += -DDBG=0 -DBCM_PROC_FS=1 -DT3_JUMBO_RCV_RCB_ENTRY_COUNT=256 -DNICE_SUPPORT -DBCMDRIVER -I$(LINUX_DIR)/arch/mips/bcm947xx/include $(TARGET_CPPFLAGS) \
BUILDFLAGS += -DPCIX_TARGET_WORKAROUND=1 -DINCLUDE_TBI_SUPPORT=1 -DINCLUDE_5701_AX_FIX=1 -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 endif
define Build/Compile define Build/Compile

2
package/broadcom-wl/Makefile
View File

@ -161,7 +161,7 @@ define Build/Compile
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) -I. -I$(PKG_BUILD_DIR)/include -Dlinux=1" \ CFLAGS="$(TARGET_CFLAGS) -I. -I$(PKG_BUILD_DIR)/include -Dlinux=1" \
all 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 $(TARGET_CC) -o $(PKG_BUILD_DIR)/wl $(PKG_BUILD_DIR)/wl_exe.o
endef endef

2
package/ead/Makefile
View File

@ -32,7 +32,7 @@ CONFIGURE_PATH = tinysrp
TARGET_CFLAGS += \ TARGET_CFLAGS += \
-I$(PKG_BUILD_DIR) \ -I$(PKG_BUILD_DIR) \
-I$(PKG_BUILD_DIR)/tinysrp \ -I$(PKG_BUILD_DIR)/tinysrp \
-I$(STAGING_DIR)/usr/include $(TARGET_CPPFLAGS)
MAKE_FLAGS += \ MAKE_FLAGS += \
CONFIGURE_ARGS="$(CONFIGURE_ARGS)" \ CONFIGURE_ARGS="$(CONFIGURE_ARGS)" \

4
package/hostapd/Makefile
View File

@ -94,11 +94,11 @@ define Build/ConfigureTarget
endef endef
define Build/CompileTarget 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 \ $(MAKE) -C $(PKG_BUILD_DIR)/hostapd.$(1)/hostapd \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
$(DRIVER_MAKEOPTS) \ $(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 $(CONFIG_PACKAGE_kmod-mac80211),-lm $(STAGING_DIR)/usr/lib/libnl.a) \
$(if $(findstring default,$(1)),-lssl -lcrypto)" \ $(if $(findstring default,$(1)),-lssl -lcrypto)" \
hostapd hostapd_cli hostapd hostapd_cli

4
package/iw/Makefile
View File

@ -32,8 +32,8 @@ define Build/Configure
endef endef
MAKE_FLAGS += \ MAKE_FLAGS += \
CFLAGS="$(TARGET_CFLAGS) -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/mac80211 -I$(STAGING_DIR)/usr/include/libnl $(TARGET_CPPFLAGS)" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -lnl" LDFLAGS="$(TARGET_LDFLAGS) -lnl"
ifneq ($(CONFIG_LINUX_2_6),) ifneq ($(CONFIG_LINUX_2_6),)
define Package/iw/install define Package/iw/install

4
package/opkg/Makefile
View File

@ -41,8 +41,8 @@ define Package/opkg/conffiles
endef endef
TARGET_CFLAGS += $(FPIC) $(if $(CONFIG_GCC_VERSION_4_3),-Wno-array-bounds) 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_CFLAGS += $(TARGET_CPPFLAGS)
EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib EXTRA_LDFLAGS += $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--disable-curl \ --disable-curl \

1
package/swconfig/Makefile
View File

@ -23,7 +23,6 @@ define Package/swconfig
endef endef
TARGET_CPPFLAGS += \ TARGET_CPPFLAGS += \
-I$(STAGING_DIR)/usr/include \
-I$(LINUX_DIR)/include \ -I$(LINUX_DIR)/include \
-I$(PKG_BUILD_DIR) -I$(PKG_BUILD_DIR)

2
package/uci/Makefile
View File

@ -53,7 +53,7 @@ UCI_MAKEOPTS = \
COPTS="$(TARGET_CFLAGS)" \ COPTS="$(TARGET_CFLAGS)" \
DEBUG="$(DEBUG)" \ DEBUG="$(DEBUG)" \
VERSION="$(UCI_VERSION)" \ VERSION="$(UCI_VERSION)" \
CPPFLAGS="-I$(PKG_BUILD_DIR) -I$(STAGING_DIR)/usr/include" \ CPPFLAGS="-I$(PKG_BUILD_DIR) $(TARGET_CPPFLAGS)" \
OS="Linux" OS="Linux"
# work around a nasty gcc bug # work around a nasty gcc bug