[packages] massive change: replace occurences of -I$(STAGING_DIR)/{include,usr/include} and -L$(STAGING_DIR)/{lib,usr/lib} with $(TARGET_CPPFLAGS) and $(TARGET_LDFLAGS) respectively

git-svn-id: svn://svn.openwrt.org/openwrt/packages@15480 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-04-29 12:56:17 +00:00
parent 9c94ea0e32
commit f907dabbe7
106 changed files with 272 additions and 277 deletions
--- a/net/aircrack-ng/Makefile
+++ b/net/aircrack-ng/Makefile
@ -41,8 +41,8 @@ define Build/Compile
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) -Wall -Iinclude/ -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -D_REVISION=$(PKG_REV)" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		CFLAGS="$(TARGET_CFLAGS) -Wall -Iinclude/ $(TARGET_CPPFLAGS) -D_REVISION=$(PKG_REV)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
 		prefix="/usr" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		OSNAME=Linux \
--- a/net/amwall/Makefile
+++ b/net/amwall/Makefile
@ -34,7 +34,7 @@ define Build/Compile
 		V= \
 		LDIR="$(PKG_BUILD_DIR)" \
 		AMSEL_INCLUDE="$(STAGING_DIR)/usr/include" \
-		OPT_LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		OPT_LDFLAGS="$(TARGET_LDFLAGS)" \
 		PREFIX="/usr" \
 		CONFIG="$(PKG_BUILD_DIR)/etc/amsel" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
--- a/net/arpd/Makefile
+++ b/net/arpd/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -42,8 +42,8 @@ endef
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CCOPT="$(TARGET_CFLAGS)" \
-		INCLS="-I. -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LIBS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lpcap -ldnet -levent"
+		INCLS="-I. $(TARGET_CPPFLAGS)" \
+		LIBS="$(TARGET_LDFLAGS) -lpcap -ldnet -levent"
 endef

 define Package/arpd/install
--- a/net/arpwatch/Makefile
+++ b/net/arpwatch/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -43,8 +43,8 @@ define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		ARPDIR=/etc/arpwatch \
 		CCOPT="$(TARGET_CFLAGS)" \
-		INCLS="-I. -I$(STAGING_DIR)/usr/include" \
-		LIBS="-L$(STAGING_DIR)/usr/lib -lpcap"
+		INCLS="-I. $(TARGET_CPPFLAGS)" \
+		LIBS="$(TARGET_LDFLAGS) -lpcap"
 endef

 define Package/arpwatch/install
--- a/net/bitchx/Makefile
+++ b/net/bitchx/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -34,7 +34,7 @@ define Build/Compile
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all
 	mkdir -p $(PKG_INSTALL_DIR)/tmp
--- a/net/bitlbee/Makefile
+++ b/net/bitlbee/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -43,8 +43,8 @@ define Build/Configure
 	(cd $(PKG_BUILD_DIR); \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		CPPFLAGS="$(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
 		STAGING_DIR="$(STAGING_DIR)" \
 		STRIP="$(STRIP)" \
 		./configure \
@ -67,7 +67,7 @@ define Build/Configure
 		$(PKG_BUILD_DIR)/Makefile.settings
 	@echo 'CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include' >> \
 		$(PKG_BUILD_DIR)/Makefile.settings
-	@echo 'LFLAGS+=-L$(STAGING_DIR)/usr/lib' >> \
+	@echo 'LFLAGS+=$(TARGET_LDFLAGS)' >> \
 		$(PKG_BUILD_DIR)/Makefile.settings
 	@echo 'LFLAGS+=-L$(STAGING_DIR)/usr/lib/libiconv/lib' >> \
 		$(PKG_BUILD_DIR)/Makefile.settings
--- a/net/click/Makefile
+++ b/net/click/Makefile
@ -1,4 +1,5 @@
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -58,8 +59,8 @@ define Build/Configure
 		$(TARGET_CONFIGURE_OPTS) \
 		CXXFLAGS="-static -Os -MD" \
 		CFLAGS="-static -MD" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		CPPFLAGS="$(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
 		$(BUILDOPTS) \
 		./configure \
 		  --prefix=/usr \
--- a/net/cups/Makefile
+++ b/net/cups/Makefile
@ -62,7 +62,7 @@ define Build/Configure
 		--disable-gssapi \
 		--disable-slp, \
 		UNAME="Linux" \
-		LIBS="-L$(STAGING_DIR)/usr/lib -lz -lpng -ljpeg" \
+		LIBS="$(TARGET_LDFLAGS) -lz -lpng -ljpeg" \
 	)
 endef

--- a/net/dansguardian/Makefile
+++ b/net/dansguardian/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -34,7 +34,7 @@ endef
 CONFIGURE_VARS += \
 	INCLUDES="" \
 	CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
-	CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/uClibc++" \
+	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \
 	LDFLAGS="$$$$LDFLAGS" \
 	LIBS="-nodefaultlibs -luClibc++ -lpthread $(LIBGCC_S)" \

--- a/net/dsl-qos-queue/Makefile
+++ b/net/dsl-qos-queue/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -31,8 +31,8 @@ endef

 define Build/Compile
 	$(call Build/Compile/Default, \
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libipq -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libipq $(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
 		all \
 	)
 endef
--- a/net/elinks/Makefile
+++ b/net/elinks/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -36,8 +36,8 @@ define Build/Configure
                x=`echo ac_cv_file_$(PKG_BUILD_DIR)/features.conf | tr [:blank:]-/. _` && export $$$${x}=yes && \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
-                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+                CPPFLAGS="$(TARGET_CPPFLAGS)" \
+                LDFLAGS="$(TARGET_LDFLAGS)" \
                ./configure \
                        --target=$(GNU_TARGET_NAME) \
                        --host=$(GNU_TARGET_NAME) \
--- a/net/faifa/Makefile
+++ b/net/faifa/Makefile
@ -43,8 +43,8 @@ define Build/Compile
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) -DSVN_REV=$(PKG_REV) -Iinclude/ -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		CFLAGS="$(TARGET_CFLAGS) -DSVN_REV=$(PKG_REV) -Iinclude/ $(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		faifa
 endef
--- a/net/httping/Makefile
+++ b/net/httping/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -33,7 +33,7 @@ endef

 define Build/Compile
 	$(call Build/Compile/Default, \
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
 	)
 endef

--- a/net/icecast/Makefile
+++ b/net/icecast/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -62,7 +62,7 @@ define Build/Configure
 		--with-vorbis="$(TREMOR_DIR)" \
 		--with-xslt-config="$(STAGING_DIR)/usr/bin/xslt-config" \
 		, \
-		CPPFLAGS="-I$(TREMOR_DIR)/include -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/libxml2 " \
+		CPPFLAGS="-I$(TREMOR_DIR)/include -I$(STAGING_DIR)/usr/include/libxml2 $(TARGET_CPPFLAGS)" \
 	)
 endef

--- a/net/imspector/Makefile
+++ b/net/imspector/Makefile
@ -1,4 +1,4 @@
-# Copyright (C) 2007-2008 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -47,13 +47,13 @@ define Build/Compile
 	    DESTDIR="$(PKG_INSTALL_DIR)" \
 	    $(TARGET_CONFIGURE_OPTS) \
 	    SSL_DIR="$(STAGING_DIR)/usr" \
-	    SSL_LIBS="-L$(STAGING_DIR)/usr/lib -lssl -lcrypto" \
-	    SSL_FLAGS="-I$(STAGING_DIR)/usr/include -DHAVE_SSL" \
+	    SSL_LIBS="$(TARGET_LDFLAGS) -lssl -lcrypto" \
+	    SSL_FLAGS="$(TARGET_CPPFLAGS) -DHAVE_SSL" \
 	    SSL_OBJS=sslstate.o \
 	    PREFIX="$(STAGING_DIR)/usr" \
 	    CXX=$(TARGET_CXX) \
-	    CXXFLAGS="$(TARGET_CXXFLAGS) $(TARGET_CFLAGS) $(FPIC) -I$(STAGING_DIR)/usr/include \
-			-L$(STAGING_DIR)/usr/lib -DHAVE_SSL" \
+	    CXXFLAGS="$(TARGET_CXXFLAGS) $(TARGET_CFLAGS) $(FPIC) $(TARGET_CPPFLAGS) \
+			$(TARGET_LDFLAGS) -DHAVE_SSL" \
 	    all
 endef

--- a/net/iodine/Makefile
+++ b/net/iodine/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -48,8 +48,8 @@ endef

 define Build/Compile
 	$(call Build/Compile/Default,\
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -c -DLINUX" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -lz" \
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -c -DLINUX" \
+		LDFLAGS="$(TARGET_LDFLAGS) -lz" \
 		all \
 	)
 endef
--- a/net/iptraf/Makefile
+++ b/net/iptraf/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -47,8 +47,8 @@ define Build/Compile
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		DEBUG="" \
-		INCLUDEDIR="-I../support -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDOPTS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		INCLUDEDIR="-I../support $(TARGET_CPPFLAGS)" \
+		LDOPTS="$(TARGET_LDFLAGS)" \
 		PLATFORM="-DPLATFORM=\\\"Linux/$(ARCH)\\\"" \
 		TARGET="/usr/bin" \
 		WORKDIR="/var/lib/iptraf" \
--- a/net/irssi/Makefile
+++ b/net/irssi/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -79,7 +79,7 @@ define Package/$(1)/install
 endef
 endef

-EXTRA_CFLAGS+=-I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/lib/libiconv/include -I$(STAGING_DIR)/usr/lib/libintl/include
+EXTRA_CFLAGS+=$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/lib/libiconv/include -I$(STAGING_DIR)/usr/lib/libintl/include
 EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib/libiconv/lib -L$(STAGING_DIR)/usr/lib/libintl/lib

 ifneq ($(SDK)$(CONFIG_PACKAGE_irssi),)
--- a/net/karma/Makefile
+++ b/net/karma/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -44,8 +44,8 @@ endef
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)/src/ \
 		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDLIBS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lpcap -lncurses"
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+		LDLIBS="$(TARGET_LDFLAGS) -lpcap -lncurses"
 endef

 define Package/karma/install	
--- a/net/leafnode/Makefile
+++ b/net/leafnode/Makefile
@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
 CONFIGURE_ARGS+=--sysconfdir=/etc/leafnode
 CONFIGURE_VARS+=LIBS=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib

-EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
+EXTRA_CFLAGS+= $(TARGET_CPPFLAGS)

 EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib

--- a/net/miax/Makefile
+++ b/net/miax/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -37,8 +37,8 @@ define Build/Compile
 	$(MAKE) -C "$(PKG_BUILD_DIR)" \
 		CC="$(TARGET_CC)" \
 		OFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		CPPFLAGS="$(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
 		all
 endef

--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -30,7 +30,7 @@ define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) -f Makefile.openwrt \
 		$(TARGET_CONFIGURE_OPTS) \
 		STAGING_DIR="$(STAGING_DIR)" \
-		CFLAGS="$(TARGET_CFLAGS) -I $(STAGING_DIR)/usr/include" \
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
 		LIBS="$(STAGING_DIR)/usr/lib/libiptc.a"
 endef

--- a/net/nagios/Makefile
+++ b/net/nagios/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -32,7 +32,7 @@ define Package/nagios/description
 	service and network monitoring program
 endef

-EXTRA_CFLAGS += -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
+EXTRA_CFLAGS += $(TARGET_CPPFLAGS)

 CONFIGURE_ARGS += \
 	--with-nagios-user="root" \
--- a/net/natpmp/Makefile
+++ b/net/natpmp/Makefile
@ -33,8 +33,8 @@ define Build/Compile
 		CC="$(TARGET_CC)" \
 		LD="$(TARGET_CC)" \
 		CFLAGS="$(strip $(TARGET_CFLAGS))" \
-		CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include -DIPTABLES_PATH=\\\"/usr/sbin\\\"" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		CPPFLAGS="$$$$CPPFLAGS $(TARGET_CPPFLAGS) -DIPTABLES_PATH=\\\"/usr/sbin\\\"" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
 		prefix="$(PKG_INSTALL_DIR)/usr"
 endef

--- a/net/nbd/Makefile
+++ b/net/nbd/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -39,7 +39,7 @@ define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CC="$(TARGET_CC)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
-		CPPFLAGS="$(TARGET_CPPFLAGS) -L$(STAGING_DIR)/usr/lib/libintl/lib/ -L$(STAGING_DIR)/usr/lib/" \
+		CPPFLAGS="$(TARGET_CPPFLAGS) -L$(STAGING_DIR)/usr/lib/libintl/lib/ $(TARGET_LDFLAGS)" \
 		nbd-client
 endef

--- a/net/ngrep/Makefile
+++ b/net/ngrep/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -42,7 +42,7 @@ define Build/Configure
 		--enable-ipv6 \
 		--disable-dropprivs \
 		,\
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -lpcre" \
+		LDFLAGS="$(TARGET_LDFLAGS) -lpcre" \
 	)
 endef

--- a/net/nufw/Makefile
+++ b/net/nufw/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -71,10 +71,10 @@ CONFIGURE_ARGS += \

 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/lib/libintl/include/ \
-				-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include \
-				-I$(STAGING_DIR)/usr/lib/libiconv/include" \
-		LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib \
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) \
+			-I$(STAGING_DIR)/usr/lib/libintl/include \
+			-I$(STAGING_DIR)/usr/lib/libiconv/include" \
+		LDFLAGS="$(TARGET_LDFLAGS) \
 			-L$(STAGING_DIR)/usr/lib/libintl/lib \
 			-L$(STAGING_DIR)/usr/lib/libiconv/lib \
 			-Wl,-rpath-link,$(STAGING_DIR)/usr/lib -liconv \
--- a/net/openswan/Makefile
+++ b/net/openswan/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -55,11 +55,11 @@ $(call Package/openswan/Default/description)
 endef

 TARGET_CPPFLAGS = \
-	-I$(STAGING_DIR)/usr/include \
+	$(TARGET_CPPFLAGS) \
 	-I$(LINUX_DIR)/include

 TARGET_LDFLAGS = \
-	-L$(STAGING_DIR)/usr/lib
+	$(TARGET_LDFLAGS)

 OPENSWAN_MAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
 	$(TARGET_CONFIGURE_OPTS) \
--- a/net/pmacct/Makefile
+++ b/net/pmacct/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -101,7 +101,7 @@ $(PKG_BUILD_DIR)/nfacctd$(1) $(PKG_BUILD_DIR)/pmacctd$(1): $(STAMP_CONFIGURED)
 		,,\
 	);
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
 		all
 	mv -f $(PKG_BUILD_DIR)/src/nfacctd $(PKG_BUILD_DIR)/nfacctd$(1)
 	mv -f $(PKG_BUILD_DIR)/src/pmacctd $(PKG_BUILD_DIR)/pmacctd$(1)
--- a/net/portmap/Makefile
+++ b/net/portmap/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -33,9 +33,9 @@ define Package/portmap/description
 endef

 MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -DHOSTS_ACCESS -DFACILITY=LOG_DAEMON -DIGNORE_SIGCHLD" \
+	CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -DHOSTS_ACCESS -DFACILITY=LOG_DAEMON -DIGNORE_SIGCHLD" \
 	RPCUSER="nobody" \
-	WRAP_LIB="-L$(STAGING_DIR)/usr/lib -lwrap" \
+	WRAP_LIB="$(TARGET_LDFLAGS) -lwrap" \
 	all

 define Package/portmap/install
--- a/net/privoxy/Makefile
+++ b/net/privoxy/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -47,7 +47,7 @@ endef

 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		SPECIAL_CFLAGS="-pthread -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib"
+		SPECIAL_CFLAGS="-pthread $(TARGET_LDFLAGS)"
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
--- a/net/prosody/Makefile
+++ b/net/prosody/Makefile
@ -48,8 +48,8 @@ endef

 define Build/Compile
 	$(call Build/Compile/Default,\
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		PREFIX="/usr" \
 		all install \
--- a/net/qolyester/Makefile
+++ b/net/qolyester/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -86,8 +86,8 @@ define Build/Compile
 	(cd $(PKG_BUILD_DIR)/source; rm -rf config.{cache,status}; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE -DNDEBUG -DSHMEM_SIZE=524288 -Dfcntl=fcntl64" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="$(LIBGCC_S) -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
+		CPPFLAGS="$(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS) $(LIBGCC_S)" \
 		ac_cv_lib_cups_httpConnect=no \
 		samba_cv_FTRUNCATE_NEEDS_ROOT=no \
 		samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=no \
--- a/net/scanlogd/Makefile
+++ b/net/scanlogd/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -46,9 +46,9 @@ define Build/Compile
 		$(TARGET_CONFIGURE_OPTS) \
 		CC="$(TARGET_CC)" LD="$(TARGET_CC)" CFLAGS="-c $(TARGET_CFLAGS)" \
 		LDFLAGS= \
-		PCAP_H="-I$(STAGING_DIR)/usr/include" \
-		NIDS_H="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/lib/libnet-1.0.x/include" \
-		NIDS_L="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libnet-1.0.x/lib -lnids -lnet -lpcap" \
+		PCAP_H="$(TARGET_CPPFLAGS)" \
+		NIDS_H="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/lib/libnet-1.0.x/include" \
+		NIDS_L="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/libnet-1.0.x/lib -lnids -lnet -lpcap" \
 		libnids
 endef

--- a/net/smtptrapd/Makefile
+++ b/net/smtptrapd/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -34,11 +34,12 @@ endef
 define Build/Compile
 	$(TARGET_CC) \
 		$(TARGET_CFLAGS) \
-		-I $(STAGING_DIR)/usr/include \
+		$(TARGET_CPPFLAGS) \
 		-D_REENTRANT \
 		$(PKG_BUILD_DIR)/smtptrapd.c \
 		-o $(PKG_BUILD_DIR)/smtptrapd \
-		-L$(STAGING_DIR)/usr/lib/ -lpthread
+		$(TARGET_LDFLAGS) \
+		-lpthread
 endef
 	
 define Package/smtptrapd/install
--- a/net/squid/Makefile
+++ b/net/squid/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -135,7 +135,7 @@ CONFIGURE_VARS += \
 define Build/Compile
 	# pass INCLUDES to compile host sources against our OpenSSL, not the host one
 	$(MAKE) -C $(PKG_BUILD_DIR)/lib \
-		INCLUDES="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		INCLUDES="$(TARGET_CPPFLAGS)" \
 		all
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
--- a/net/stun/Makefile
+++ b/net/stun/Makefile
@ -58,9 +58,8 @@ define Build/Compile
 		CFLAGS="$(TARGET_CFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
-		CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++ -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -L$(TOOLCHAIN_DIR)/usr/lib \
-			-nodefaultlibs -luClibc++ $(LIBGCC_S)" \
+		CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++ $(TARGET_CPPFLAGS)" \
+		LDFLAGS="$$$$LDFLAGS $(TARGET_LDFLAGS) -nodefaultlibs -luClibc++ $(LIBGCC_S)" \
 		all
 endef

--- a/net/subversion/Makefile
+++ b/net/subversion/Makefile
@ -86,11 +86,10 @@ CONFIGURE_ARGS += \

 CONFIGURE_VARS += \
 	svn_lib_neon=yes \
-	LDFLAGS="-lcrypt -lm -lintl -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-		-lz -L$(STAGING_DIR)/usr/lib/ -lpthread -L$(TOOLCHAIN_DIR)/usr/lib -L$(TOOLCHAIN_DIR)/lib \
+	LDFLAGS="$(TARGET_LDFLAGS) -lcrypt -lm -lintl -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
+		-lz -lpthread -L$(TOOLCHAIN_DIR)/usr/lib \
 		-L$(TOOLCHAIN_DIR)/lib" \
-	CPPFLAGS="-I$(STAGING_DIR)/usr/include/ -I$(STAGING_DIR)/usr/lib/libintl/include \
-		-I$(STAGING_DIR)/include/" \
+	CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/lib/libintl/include" \

 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all local-install
--- a/net/tcpdump/Makefile
+++ b/net/tcpdump/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -41,7 +41,7 @@ endef

 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CCOPT="$(TARGET_CFLAGS)" INCLS="-I. -I$(STAGING_DIR)/usr/include" \
+		CCOPT="$(TARGET_CFLAGS)" INCLS="-I. $(TARGET_CPPFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
--- a/net/ulogd/Makefile
+++ b/net/ulogd/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -108,7 +108,7 @@ define Build/Compile
 			-I$(PKG_BUILD_DIR)/include/ulogd \
 			-I$(PKG_BUILD_DIR)/include \
 			-I$(PKG_BUILD_DIR)/libipulog/include \
-			-I$(STAGING_DIR)/usr/include" \
+			$(TARGET_CPPFLAGS)" \
 		all install
 endef

--- a/net/vnstati/Makefile
+++ b/net/vnstati/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -36,7 +36,7 @@ endef
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS+="-I$(STAGING_DIR)/usr/include -L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib"
+		CFLAGS+="$(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib"
 endef

 define Package/vnstati/install	
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -36,7 +36,7 @@ define Build/Configure
 		--with-lzo-lib="$(STAGING_DIR)/usr/lib/" \
 		--with-ssl-headers="$(STAGING_DIR)/usr/include/openssl" \
 		, \
-		LIBS="-L$(STAGING_DIR)/usr/lib" \
+		LIBS="$(TARGET_LDFLAGS)" \
 		BLOWFISH_HDR_DIR="$(STAGING_DIR)/usr/include/openssl" \
 		LZO_HDR_DIR="$(STAGING_DIR)/usr/include/lzo" \
 		SSL_HDR_DIR="$(STAGING_DIR)/usr/include/openssl" \
--- a/net/wiviz/Makefile
+++ b/net/wiviz/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -28,8 +28,8 @@ define Build/Prepare
 	$(CP) ./src/* $(PKG_BUILD_DIR)/
 endef

-EXTRA_CFLAGS += -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
-EXTRA_LDFLAGS += -L$(STAGING_DIR)/usr/lib
+EXTRA_CFLAGS += $(TARGET_CPPFLAGS)
+EXTRA_LDFLAGS += $(TARGET_LDFLAGS)

 define Build/Compile
 	$(call Build/Compile/Default, \
--- a/net/wknock/Makefile
+++ b/net/wknock/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -34,8 +34,8 @@ endef
 define Build/Compile	
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lpcap" \
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS) -lpcap" \
 		all
 endef