EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move TARGET_* flags from ./include/package-default.mk to ./rules.mk, remove EXTRA_* flags but still use them in configure and make

Browse Source 
SVN-Revision: 8592
This commit is contained in:
Nicolas Thill 2007-09-03 09:06:03 +00:00
parent 8dc7ced4d4
commit 5b4bfbd6d4
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/package-defaults.mk
View File

@ -42,9 +42,6 @@ ifneq ($(strip $(PKG_UNPACK)),)
endef endef
endif endif
TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
TARGET_LDFLAGS:=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
CONFIGURE_ARGS = \ CONFIGURE_ARGS = \
--target=$(GNU_TARGET_NAME) \ --target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \
@ -68,7 +65,7 @@ CONFIGURE_VARS = \
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig"
@ -89,9 +86,9 @@ define Build/Configure/Default
endef endef
MAKE_VARS = \ MAKE_VARS = \
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
LDFLAGS="$(EXTRA_LDFLAGS) " LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDCFLAGS)"
MAKE_FLAGS = \ MAKE_FLAGS = \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
@ -106,5 +103,3 @@ define Build/Compile/Default
$(MAKE_FLAGS) \ $(MAKE_FLAGS) \
$(1); $(1);
endef endef

6
rules.mk
View File

@ -56,6 +56,8 @@ endif
TARGET_PATH:=$(TOOLCHAIN_DIR)/bin:$(STAGING_DIR_HOST)/bin:$(STAGING_DIR)/usr/bin:$(PATH) TARGET_PATH:=$(TOOLCHAIN_DIR)/bin:$(STAGING_DIR_HOST)/bin:$(STAGING_DIR)/usr/bin:$(PATH)
TARGET_CFLAGS:=$(TARGET_OPTIMIZATION) -fhonour-copts TARGET_CFLAGS:=$(TARGET_OPTIMIZATION) -fhonour-copts
TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
TARGET_LDFLAGS:=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
export PATH:=$(TARGET_PATH) export PATH:=$(TARGET_PATH)
@ -82,10 +84,6 @@ ifneq ($(CONFIG_CCACHE),)
TARGET_CC:= ccache $(TARGET_CC) TARGET_CC:= ccache $(TARGET_CC)
endif endif
EXTRA_CPPFLAGS := -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
EXTRA_CFLAGS := $(EXTRA_CPPFLAGS)
EXTRA_LDFLAGS := -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
TARGET_CONFIGURE_OPTS:= \ TARGET_CONFIGURE_OPTS:= \
AR=$(TARGET_CROSS)ar \ AR=$(TARGET_CROSS)ar \
AS="$(TARGET_CC) -c $(TARGET_CFLAGS)" \ AS="$(TARGET_CC) -c $(TARGET_CFLAGS)" \