From e721a7c07e0a9ab4a6a8fe7aff9f378ac4144df6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 25 Jun 2010 23:26:04 +0200 Subject: Merge TARGET_CONFIGURE_ENV into TARGET_CONFIGURE_OPTS TARGET_CONFIGURE_ENV defines CFLAGS, LDFLAGS, CXXFLAGS and FCFLAGS, separatly from all other variables that are part of TARGET_CONFIGURE_OPTS. This is useless and not consistent with the HOST_CONFIGURE_ variables, therefore we merge TARGET_CONFIGURE_ENV into TARGET_CONFIGURE_OPTS and fix the few users of TARGET_CONFIGURE_ENV. Signed-off-by: Thomas Petazzoni --- package/Makefile.in | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'package/Makefile.in') diff --git a/package/Makefile.in b/package/Makefile.in index 1c965c9cf..189806d7b 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -194,18 +194,16 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \ FCFLAGS_FOR_BUILD="$(HOST_FCFLAGS)" \ DEFAULT_ASSEMBLER="$(TARGET_AS)" \ DEFAULT_LINKER="$(TARGET_LD)" \ + CFLAGS="$(TARGET_CFLAGS)" \ + CXXFLAGS="$(TARGET_CXXFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" \ + FCFLAGS="$(TARGET_FCFLAGS)" \ PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \ PERLLIB="$(HOST_DIR)/usr/lib/perl" \ STAGING_DIR="$(STAGING_DIR)" -TARGET_CONFIGURE_ENV=\ - CFLAGS="$(TARGET_CFLAGS)" \ - CXXFLAGS="$(TARGET_CXXFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - FCFLAGS="$(TARGET_FCFLAGS)" \ - TARGET_MAKE_ENV=PATH=$(TARGET_PATH) \ PERLLIB="$(HOST_DIR)/usr/lib/perl" -- cgit v1.2.3