diff options
| author | Nicolas Thill <nico@openwrt.org> | 2007-09-03 09:06:03 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2007-09-03 09:06:03 +0000 |
| commit | 5b4bfbd6d4e17f601cbf66d998cc788a62ac3f4d (patch) | |
| tree | aa6ae991d83d2f7ff5f6bcd7a237da7b4cc133f2 | |
| parent | 8dc7ced4d4df85bc6cc77b625d54150a64f31bc6 (diff) | |
| download | master-31e0f0ae-5b4bfbd6d4e17f601cbf66d998cc788a62ac3f4d.tar.gz master-31e0f0ae-5b4bfbd6d4e17f601cbf66d998cc788a62ac3f4d.tar.bz2 master-31e0f0ae-5b4bfbd6d4e17f601cbf66d998cc788a62ac3f4d.zip | |
move TARGET_* flags from ./include/package-default.mk to ./rules.mk, remove EXTRA_* flags but still use them in configure and make
SVN-Revision: 8592
| -rw-r--r-- | include/package-defaults.mk | 13 | ||||
| -rw-r--r-- | rules.mk | 6 |
2 files changed, 6 insertions, 13 deletions
diff --git a/include/package-defaults.mk b/include/package-defaults.mk index c0e13f412f..7a753c6331 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -42,9 +42,6 @@ ifneq ($(strip $(PKG_UNPACK)),) endef 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 = \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ @@ -68,7 +65,7 @@ CONFIGURE_VARS = \ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" @@ -89,9 +86,9 @@ define Build/Configure/Default endef MAKE_VARS = \ - CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ - CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ - LDFLAGS="$(EXTRA_LDFLAGS) " + CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ + CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDCFLAGS)" MAKE_FLAGS = \ $(TARGET_CONFIGURE_OPTS) \ @@ -106,5 +103,3 @@ define Build/Compile/Default $(MAKE_FLAGS) \ $(1); endef - - @@ -56,6 +56,8 @@ endif TARGET_PATH:=$(TOOLCHAIN_DIR)/bin:$(STAGING_DIR_HOST)/bin:$(STAGING_DIR)/usr/bin:$(PATH) 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) @@ -82,10 +84,6 @@ ifneq ($(CONFIG_CCACHE),) TARGET_CC:= ccache $(TARGET_CC) 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:= \ AR=$(TARGET_CROSS)ar \ AS="$(TARGET_CC) -c $(TARGET_CFLAGS)" \ |