[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 · 2009-04-29 12:56:17 +00:00 · f907dabbe7
commit f907dabbe7
parent 9c94ea0e32
106 changed files with 272 additions and 277 deletions
--- a/Xorg/app/eterm/Makefile
+++ b/Xorg/app/eterm/Makefile
@ -1,5 +1,5 @@
 #
-# 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.
@ -45,8 +45,8 @@ CONFIGURE_VARS += \

 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)\
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/lib/libiconv/include/" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib/libiconv/lib/"
+		CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/lib/libiconv/include/" \
+		LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/libiconv/lib/"
 	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
 endef

--- a/Xorg/app/xine-ui/Makefile
+++ b/Xorg/app/xine-ui/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.
@ -51,7 +51,7 @@ define Build/Configure
 endef

 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) X_LIBS="-L$(STAGING_DIR)/usr/lib -lfreetype"
+	$(MAKE) -C $(PKG_BUILD_DIR) X_LIBS="$(TARGET_LDFLAGS) -lfreetype"
 	$(MAKE) -C $(PKG_BUILD_DIR)/ install DESTDIR=$(PKG_INSTALL_DIR)
 endef

--- a/Xorg/lib/cairo/Makefile
+++ b/Xorg/lib/cairo/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.
@ -39,7 +39,7 @@ endef

 CONFIGURE_VARS+=FONTCONFIG_LIBS="-lfreetype -lfontconfig -lz -lexpat"
 CONFIGURE_ARGS+=--enable-freetype=yes
-TARGET_CFLAGS+=-L$(STAGING_DIR)/usr/lib
+TARGET_CFLAGS+=$(TARGET_LDFLAGS)

 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib/
--- a/Xorg/lib/gtk2/Makefile
+++ b/Xorg/lib/gtk2/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.
@ -28,7 +28,7 @@ EXTRA_LDFLAGS+=\
 	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
 	-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
 	-L$(STAGING_DIR)/usr/lib/libiconv/lib/ \
-	-L$(STAGING_DIR)/usr/lib/
+	$(TARGET_LDFLAGS)

 STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_gtk2 CONFIG_PACKAGE_gtk2-cups)

--- a/Xorg/lib/libast/Makefile
+++ b/Xorg/lib/libast/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.
@ -43,8 +43,8 @@ endef

 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		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)"
 	$(MAKE) -C $(PKG_BUILD_DIR) install DESTDIR=$(PKG_INSTALL_DIR)
 endef

--- a/Xorg/wm/matchbox-window-manager/Makefile
+++ b/Xorg/wm/matchbox-window-manager/Makefile
@ -1,5 +1,5 @@
 #
-# 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.
@ -34,7 +34,7 @@ endef
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR=$(PKG_INSTALL_DIR) \
-		LIBMB_LIBS="-L$(STAGING_DIR)/usr/lib -lfontconfig -lXrender \
+		LIBMB_LIBS="$(TARGET_LDFLAGS) -lfontconfig -lXrender \
 		-lz -lexpat -lfreetype -lXft -lmb -lX11 -lXext -lXau -lXdmcp \
 		-lpng12" \
 		all install 
--- a/Xorg/xorg/app/fontconfig/Makefile
+++ b/Xorg/xorg/app/fontconfig/Makefile
@ -37,8 +37,8 @@ define Build/Configure
 endef

 define Build/Compile
-	$(foreach dir,fc-arch fc-case fc-lang fc-glyphname src fc-cache fc-list, $(MAKE) -C $(PKG_BUILD_DIR)/$(dir) CFLAGS="-I$(STAGING_DIR)/usr/include"  \
-			CPPFLAGS="" LDFLAGS="-L$(STAGING_DIR)/usr/lib";)
+	$(foreach dir,fc-arch fc-case fc-lang fc-glyphname src fc-cache fc-list, $(MAKE) -C $(PKG_BUILD_DIR)/$(dir) CFLAGS="$(TARGET_CPPFLAGS)"  \
+			CPPFLAGS="" LDFLAGS="$(TARGET_LDFLAGS)";)
 	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" DOCSRC="" install
 endef

--- a/Xorg/xorg/driver/template.mk
+++ b/Xorg/xorg/driver/template.mk
@ -32,8 +32,7 @@ endef

 EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
 		-I$(STAGING_DIR)/usr/include/X11/ \
-		-I$(STAGING_DIR)/usr/include/ \
-		-I$(STAGING_DIR)/include/
+		$(TARGET_CPPFLAGS)

 EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS)

--- a/Xorg/xorg/driver/xf86-video-ati/Makefile
+++ b/Xorg/xorg/driver/xf86-video-ati/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.
@ -32,8 +32,7 @@ endef

 EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
 		-I$(STAGING_DIR)/usr/include/X11/ \
-		-I$(STAGING_DIR)/usr/include/ \
-		-I$(STAGING_DIR)/include/
+		$(TARGET_CPPFLAGS)

 EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS)

--- a/Xorg/xorg/driver/xf86-video-intel/Makefile
+++ b/Xorg/xorg/driver/xf86-video-intel/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.
@ -34,9 +34,8 @@ endef

 EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
 		-I$(STAGING_DIR)/usr/include/X11/ \
-		-I$(STAGING_DIR)/usr/include/ \
 		-I$(STAGING_DIR)/usr/include/drm \
-		-I$(STAGING_DIR)/include/
+		$(TARGET_CPPFLAGS)

 EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS)

--- a/Xorg/xorg/driver/xf86-video-nv/Makefile
+++ b/Xorg/xorg/driver/xf86-video-nv/Makefile
@ -33,8 +33,7 @@ endef

 EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \
 		-I$(STAGING_DIR)/usr/include/X11/ \
-		-I$(STAGING_DIR)/usr/include/ \
-		-I$(STAGING_DIR)/include/
+		$(TARGET_CPPFLAGS)

 EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS)

--- a/admin/gkrellmd/Makefile
+++ b/admin/gkrellmd/Makefile
@ -1,5 +1,5 @@
 #
-# 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.
@ -40,7 +40,7 @@ define Build/Compile
 		CC="$(TARGET_CC)" \
 		glib12="yes" \
 		without-libsensors="yes" \
-		GLIB12_LIB="-L$(STAGING_DIR)/usr/lib -lglib -lgmodule" \
+		GLIB12_LIB="$(TARGET_LDFLAGS) -lglib -lgmodule" \
 		GLIB12_INCLUDE="-I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include"
 endef

--- a/admin/syslog-ng/Makefile
+++ b/admin/syslog-ng/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.
@ -44,8 +44,8 @@ define Build/Configure
        --enable-tcp-wrapper \
        --with-libol="$(STAGING_DIR)/host/bin" \
 		, \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/libol" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libol" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include/libol $(TARGET_CPPFLAGS)" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib/libol $(TARGET_LDFLAGS)" \
 	)
 endef

--- a/ipv6/dhcp6/Makefile
+++ b/ipv6/dhcp6/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.
@ -57,12 +57,12 @@ endef
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)/client \
 		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"
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)"
 	$(MAKE) -C $(PKG_BUILD_DIR)/server \
 		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"
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)"
 endef

 define Package/dhcp6-client/install
--- a/ipv6/gw6c/Makefile
+++ b/ipv6/gw6c/Makefile
@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2009 OpenWrt.org
 #

 include $(TOPDIR)/rules.mk
@ -36,7 +36,7 @@ endef
 GW6C_OPTS:= \
 	C_COMPILER="$(TARGET_CC) -c -DNO_STDLIBCXX" \
 	COMPILER="$(TARGET_CROSS)g++ -c -DNO_STDLIBCXX" \
-	CPP_FLAGS="$(TARGET_CFLAGS) -fno-builtin -nostdinc++ -I. -Wall -DNDEBUG -I$(STAGING_DIR)/usr/include/uClibc++ -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+	CPP_FLAGS="$(TARGET_CFLAGS) -fno-builtin -nostdinc++ -I. -Wall -DNDEBUG -I$(STAGING_DIR)/usr/include/uClibc++ $(TARGET_CPPFLAGS)" \
 	RANLIB="$(TARGET_CROSS)ranlib" \
 	ARCHIVER="$(TARGET_CROSS)ar" \
 	C_LINKER="$(TARGET_CC)" \
@ -55,7 +55,7 @@ define Build/Compile
 			-I$(PKG_BUILD_DIR)/gw6c/src/gw6c/platform/openwrt -I$(PKG_BUILD_DIR)/gw6c/src/gw6c" \
 		LDFLAGS="-L$(PKG_BUILD_DIR)/gw6c/src/gw6c/gw6cconfig \
 			-L$(PKG_BUILD_DIR)/gw6c/src/gw6c/gw6cmessaging \
-			-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -nodefaultlibs -luClibc++ $(LIBGCC_S)" \
+			$(TARGET_LDFLAGS) -nodefaultlibs -luClibc++ $(LIBGCC_S)" \
 		target="openwrt" \
 		installdir="$(PKG_INSTALL_DIR)"
 endef
--- a/ipv6/send/Makefile
+++ b/ipv6/send/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.
@ -40,7 +40,7 @@ endef

 MAKE_FLAGS += \
 	CC="$(TARGET_CC)" \
-	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnetfilter_queue -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnetfilter_queue $(TARGET_CPPFLAGS)" \
 	LDFLAGS="$(TARGET_LDFLAGS) -lnfnetlink" \

 define Package/send/install
--- a/lang/jamvm/Makefile
+++ b/lang/jamvm/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.
@ -41,7 +41,7 @@ CONFIGURE_ARGS+= \

 define Build/Compile	
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		CPPFLAGS="$(TARGET_CPPFLAGS)" \
 		all
 endef

--- a/lang/luaexpat/Makefile
+++ b/lang/luaexpat/Makefile
@ -40,7 +40,7 @@ define Build/Compile
 	LUA_INC="$(STAGING_DIR)/usr/include/" \
 	LUA_LIBDIR="$(STAGING_DIR)/usr/lib/" \
 	COMPAT_DIR="$(PKG_BUILD_DIR)/compat-5.1r5" \
-	LIB_OPTION="-shared -L$(STAGING_DIR)/usr/lib/" \
+	LIB_OPTION="-shared $(TARGET_LDFLAGS)" \
 	CC="$(TARGET_CC) $(TARGET_CFLAGS)" \
 	LD="$(TARGET_CROSS)ld -shared" 
 endef
--- a/lang/luafilesystem/Makefile
+++ b/lang/luafilesystem/Makefile
@ -35,8 +35,7 @@ endef
 define Build/Configure
 endef

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

 TARGET_LDFLAGS += -llua

--- a/lang/luaprofiler/Makefile
+++ b/lang/luaprofiler/Makefile
@ -33,8 +33,7 @@ define Build/Configure

 endef

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

 TARGET_LDFLAGS += -llua

--- a/lang/luasec/Makefile
+++ b/lang/luasec/Makefile
@ -35,8 +35,8 @@ endef

 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)/src linux \
-	INCDIR="-I$(STAGING_DIR)/usr/include/" \
-	LIBDIR="-L$(STAGING_DIR)/usr/lib/" \
+		INCDIR="$(TARGET_CPPFLAGS)" \
+		LIBDIR="$(TARGET_LDFLAGS)" \
 		CC="$(TARGET_CC) $(TARGET_CFLAGS)" \
 		LD="$(TARGET_CROSS)ld -shared" 
 endef
--- a/lang/luasocket/Makefile
+++ b/lang/luasocket/Makefile
@ -37,8 +37,8 @@ endef

 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)/ all \
-	LIBDIR="-L$(STAGING_DIR)/usr/lib/" \
-	CC="$(TARGET_CC) $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
+	LIBDIR="$(TARGET_LDFLAGS)" \
+	CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
 	LD="$(TARGET_CROSS)ld -shared" 
 endef

--- a/lang/perl/Makefile
+++ b/lang/perl/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.
@ -101,11 +101,11 @@ define Build/perl/Configure
 	-$(MAKE) -C $(PKG_BUILD_DIR) clean
 	sed \
 		-e 's!%%CC%%!$(TARGET_CC)!g' \
-		-e 's!%%CFLAGS%%!$(TARGET_CFLAGS) -DUSE_CROSS_COMPILE -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include!g' \
+		-e 's!%%CFLAGS%%!$(TARGET_CFLAGS) -DUSE_CROSS_COMPILE $(TARGET_CPPFLAGS)!g' \
 		-e 's!%%CPP%%!$(TARGET_CROSS)gcc -E!g' \
 		-e 's!%%AR%%!$(TARGET_CROSS)ar!g' \
 		-e 's!%%LD%%!$(TARGET_CROSS)gcc!g' \
-		-e 's!%%LDFLAGS%%!-rdynamic -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib!g' \
+		-e 's!%%LDFLAGS%%!-rdynamic $(TARGET_LDFLAGS)!g' \
 		-e 's!%%LIBDIRS%%!$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib!g' \
 		-e 's!%%INCDIRS%%!$(STAGING_DIR)/include $(STAGING_DIR)/usr/include!g' \
 		files/config.sh-$(patsubst i386,i486,$(ARCH)).in \
--- a/libs/apr-util/Makefile
+++ b/libs/apr-util/Makefile
@ -1,5 +1,5 @@
 #
-# 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.
@ -42,7 +42,7 @@ CONFIGURE_VARS += \
 	APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build-1" \

 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) APRUTIL_LIBS="-lsqlite3 -L$(STAGING_DIR)/usr/lib -lexpat -liconv -lapr-1 -luuid -lm -lcrypt" all
+	$(MAKE) -C $(PKG_BUILD_DIR) APRUTIL_LIBS="-lsqlite3 $(TARGET_LDFLAGS) -lexpat -liconv -lapr-1 -luuid -lm -lcrypt" all
 	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
 endef

--- a/libs/db/Makefile
+++ b/libs/db/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.
@ -35,8 +35,8 @@ define Build/Configure
 	(cd $(PKG_BUILD_DIR)/build_unix; rm -f config.cache; \
 		$(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)" \
 		../dist/configure \
 			--target=$(GNU_TARGET_NAME) \
 			--host=$(GNU_TARGET_NAME) \
--- a/libs/iksemel/Makefile
+++ b/libs/iksemel/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.
@ -35,7 +35,7 @@ CONFIGURE_ARGS += \
 	--with-libgnutls-prefix="$(STAGING_DIR)/usr" \

 CONFIGURE_VARS += \
-	LIBS="-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib -lgnutls -lgcrypt -lgpg-error" \
+	LIBS="$(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib -lgnutls -lgcrypt -lgpg-error" \

 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
--- a/libs/libdlna/Makefile
+++ b/libs/libdlna/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.
@ -36,8 +36,8 @@ endef
 define Build/Configure
 	# this is *NOT* GNU configure
 	( cd $(PKG_BUILD_DIR); \
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -lfaad -lpthread -lz" \
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS) -lfaad -lpthread -lz" \
 		HOST_CC="$(HOSTCC)" \
 		./configure \
 		--cross-compile \
--- a/libs/libnetfilter-log/Makefile
+++ b/libs/libnetfilter-log/Makefile
@ -39,8 +39,8 @@ CONFIGURE_ARGS += \
 	--enable-shared \

 CONFIGURE_VARS += \
-	LIBNFNETLINK_CFLAGS="-I$(STAGING_DIR)/usr/include" \
-	LIBNFNETLINK_LIBS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib"
+	LIBNFNETLINK_CFLAGS="$(TARGET_CPPFLAGS)" \
+	LIBNFNETLINK_LIBS="$(TARGET_LDFLAGS)"

 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) all
--- a/libs/libnetfilter-queue/Makefile
+++ b/libs/libnetfilter-queue/Makefile
@ -39,8 +39,8 @@ CONFIGURE_ARGS += \
 	--enable-shared \

 CONFIGURE_VARS += \
-	LIBNFNETLINK_CFLAGS="-I$(STAGING_DIR)/usr/include" \
-	LIBNFNETLINK_LIBS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib"
+	LIBNFNETLINK_CFLAGS="$(TARGET_CPPFLAGS)" \
+	LIBNFNETLINK_LIBS="$(TARGET_LDFLAGS)"

 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) all
--- a/libs/libnids/Makefile
+++ b/libs/libnids/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,7 +46,7 @@ TARGET_CFLAGS += $(FPIC)
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		LNETLIB="-L$(STAGING_DIR)/usr/lib/libnet-1.0.x/lib -lnet" \
-		PCAPLIB="-L$(STAGING_DIR)/usr/lib -lpcap" \
+		PCAPLIB="$(TARGET_LDFLAGS) -lpcap" \
 		install_prefix="$(PKG_INSTALL_DIR)" \
 		all install
 endef
--- a/libs/libshout/Makefile
+++ b/libs/libshout/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.
@ -38,7 +38,7 @@ endef
 define Build/Configure
 	$(call Build/Configure/Default, \
 		VORBIS_CFLAGS="-I$(STAGING_DIR)/usr/include/tremor/"\
-		VORBIS_LIBS="-L$(STAGING_DIR)/usr/lib" \
+		VORBIS_LIBS="$(TARGET_LDFLAGS)" \
 		--enable-shared \
 		--enable-static \
 	)
--- a/libs/sqlite2/Makefile
+++ b/libs/sqlite2/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.
@ -67,8 +67,8 @@ define Build/Configure
 		config_BUILD_CFLAGS="-O2" \
 		config_TARGET_CC="$(TARGET_CC)" \
 		config_TARGET_CFLAGS="$(TARGET_CFLAGS)" \
-		config_TARGET_READLINE_INC="-I$(STAGING_DIR)/usr/include" \
-		config_TARGET_READLINE_LIBS="-L$(STAGING_DIR)/usr/lib -lreadline -lncurses" \
+		config_TARGET_READLINE_INC="$(TARGET_CPPFLAGS)" \
+		config_TARGET_READLINE_LIBS="$(TARGET_LDFLAGS) -lreadline -lncurses" \
 		config_TARGET_TCL_INC="-DNO_TCL=1" \
 	)
 endef
--- a/libs/sqlite3/Makefile
+++ b/libs/sqlite3/Makefile
@ -72,8 +72,8 @@ CONFIGURE_VARS += \
 	config_BUILD_CFLAGS="-O2" \
 	config_TARGET_CC="$(TARGET_CC)" \
 	config_TARGET_CFLAGS="$(TARGET_CFLAGS)" \
-	config_TARGET_READLINE_INC="-I$(STAGING_DIR)/usr/include" \
-	config_TARGET_READLINE_LIBS="-L$(STAGING_DIR)/usr/lib -lreadline -lncurses" \
+	config_TARGET_READLINE_INC="$(TARGET_CPPFLAGS)" \
+	config_TARGET_READLINE_LIBS="$(TARGET_LDFLAGS) -lreadline -lncurses" \

 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
--- a/libs/st2205tool/Makefile
+++ b/libs/st2205tool/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,8 +36,8 @@ TARGET_CFLAGS += $(FPIC)

 MAKE_FLAGS += \
 	CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)/libst2205/" \
-	LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
-	SETPICLIBS="-L$(STAGING_DIR)/usr/lib -lgd -ljpeg -lpng -lz -L../libst2205 -lst2205" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	SETPICLIBS="$(TARGET_LDFLAGS) -lgd -ljpeg -lpng -lz -L../libst2205 -lst2205" \


 define Build/InstallDev
--- a/mail/imapfilter/Makefile
+++ b/mail/imapfilter/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.
@ -47,8 +47,8 @@ endef
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		INCDIRS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LIBDIRS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		INCDIRS="$(TARGET_CPPFLAGS)" \
+		LIBDIRS="$(TARGET_LDFLAGS)" \
 		MYCFLAGS="$(TARGET_CFLAGS)" \
 		MYLDFLAGS="-lcrypt" 
 endef
--- a/mail/ssmtp/Makefile
+++ b/mail/ssmtp/Makefile
@ -1,5 +1,5 @@
 #
-# 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.
@ -17,7 +17,7 @@ PKG_MD5SUM:=957e6fff08625fe34f4fc33d0925bbc9

 include $(INCLUDE_DIR)/package.mk

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

 define Package/ssmtp
  SECTION:=mail
@ -36,7 +36,7 @@ define Package/ssmtp/description
 endef

 CONFIGURE_VARS += \
-	LIBS="-L$(STAGING_DIR)/usr/lib -lcrypto -lssl"
+	LIBS="$(TARGET_LDFLAGS) -lcrypto -lssl"

 CONFIGURE_ARGS += \
 	--enable-ssl
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/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.
@ -186,8 +186,8 @@ endif
 define Build/Configure
 	# this is *NOT* GNU configure
 	( cd $(PKG_BUILD_DIR); \
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
 		./configure \
 		--enable-cross-compile \
 		--cross-prefix="$(TARGET_CROSS)" \
--- a/multimedia/kissdx/Makefile
+++ b/multimedia/kissdx/Makefile
@ -35,8 +35,8 @@ endef

 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CFLAGS="$(TARGET_CFLAGS) -DLinux -DUSE_INTERNAL_SENDFILE -std=gnu99 -Wall -Wstrict-prototypes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DFILE_OFFSET_BITS=64 -D_GNU_SOURCE -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/lib/libiconv/include -I$(STAGING_DIR)/usr/include/dvdread -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
+		CFLAGS="$(TARGET_CFLAGS) -DLinux -DUSE_INTERNAL_SENDFILE -std=gnu99 -Wall -Wstrict-prototypes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DFILE_OFFSET_BITS=64 -D_GNU_SOURCE -I$(STAGING_DIR)/usr/lib/libiconv/include -I$(STAGING_DIR)/usr/include/dvdread $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib/libiconv/lib $(TARGET_LDFLAGS)" \
 		STRIP=$(STRIP) \
 		CC="$(TARGET_CROSS)gcc" all
 endef
--- a/multimedia/mjpg-streamer/Makefile
+++ b/multimedia/mjpg-streamer/Makefile
@ -1,5 +1,5 @@
 #
-# 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.
@ -32,7 +32,7 @@ define Package/mjpg-streamer/description
 	Streaming application for Linux-UVC compatible webcams
 endef

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

 define Package/mjpg-streamer/install
 	$(INSTALL_DIR) $(1)/sbin
--- a/multimedia/palantir/Makefile
+++ b/multimedia/palantir/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.
@ -37,13 +37,13 @@ endef

 include $(INCLUDE_DIR)/package.mk

-export CPPFLAGS=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
-export LDFLAGS=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
+export CPPFLAGS=$(TARGET_CPPFLAGS)
+export LDFLAGS=$(TARGET_LDFLAGS)

 define Build/Compile	
 	$(MAKE) -C $(PKG_BUILD_DIR)/server/libgsm \
 		$(TARGET_CONFIGURE_OPTS) \
-		CCINC="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		CCINC="$(TARGET_CPPFLAGS)" \
 		COPTS="$(TARGET_CFLAGS)" \
 		lib/libgsm.a
 	$(MAKE) -C $(PKG_BUILD_DIR)/server \
--- a/multimedia/ushare/Makefile
+++ b/multimedia/ushare/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,8 +34,8 @@ endef
 define Build/Configure
 	# this is *NOT* GNU configure
 	( cd $(PKG_BUILD_DIR); \
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -lfaad -lpthread -lavcodec -lavformat -lavutil -lz" \
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS) -lfaad -lpthread -lavcodec -lavformat -lavutil -lz" \
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
 		PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \
 		./configure \
--- 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 \
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) \
+			-I$(STAGING_DIR)/usr/lib/libintl/include \
 			-I$(STAGING_DIR)/usr/lib/libiconv/include" \
-		LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib \
+		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

--- a/sound/mpd/Makefile
+++ b/sound/mpd/Makefile
@ -1,5 +1,5 @@
 # 
-# 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.
@ -40,16 +40,16 @@ ifndef CONFIG_PACKAGE_kmod-sound-core
 endif

 CONFIGURE_VARS += \
-	ID3TAG_LIBS="-L$(STAGING_DIR)/usr/lib -lz -lid3tag" \
-	ID3TAG_CFLAGS="-I$(STAGING_DIR)/usr/include" \
-	FLAC_LIBS="-L$(STAGING_DIR)/usr/lib -lFLAC" \
+	ID3TAG_LIBS="$(TARGET_LDFLAGS) -lz -lid3tag" \
+	ID3TAG_CFLAGS="$(TARGET_CPPFLAGS)" \
+	FLAC_LIBS="$(TARGET_LDFLAGS) -lFLAC" \
 	FLAC_CFLAGS="-I$(STAGING_DIR)/usr/include/FLAC" \
-	MAD_LIBS="-L$(STAGING_DIR)/usr/lib -lmad" \
-	MAD_CFLAGS="-I$(STAGING_DIR)/usr/include" \
-	OGGVORBIS_LIBS="-L$(STAGING_DIR)/usr/lib -lvorbisidec" \
-	OGGVORBIS_CFLAGS="-I$(STAGING_DIR)/usr/include" \
+	MAD_LIBS="$(TARGET_LDFLAGS) -lmad" \
+	MAD_CFLAGS="$(TARGET_CPPFLAGS)" \
+	OGGVORBIS_LIBS="$(TARGET_LDLFAGS) -lvorbisidec" \
+	OGGVORBIS_CFLAGS="$TARGET_CPPFLAGS)" \
 	GLIB_CFLAGS="-I$(STAGING_DIR)/usr/include/glib-2.0 -I$(STAGING_DIR)/usr/lib/glib-2.0/include" \
-	GLIB_LIBS="-L$(STAGING_DIR)/usr/lib/libintl/lib -lintl -L$(STAGING_DIR)/usr/lib/libiconv/lib -liconv -L$(STAGING_DIR)/usr/lib -lglib-2.0 -lgthread-2.0 -pthread"
+	GLIB_LIBS="$(TARGET_LDLFAGS) -L$(STAGING_DIR)/usr/lib/libintl/lib -lintl -L$(STAGING_DIR)/usr/lib/libiconv/lib -liconv -lglib-2.0 -lgthread-2.0 -pthread"

 define Build/Configure
 	$(call Build/Configure/Default, \
--- a/sound/pulseaudio/Makefile
+++ b/sound/pulseaudio/Makefile
@ -1,5 +1,5 @@
 #
-# 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.
@ -55,8 +55,8 @@ SUPP_LIBS:=-L$(STAGING_DIR)/usr/lib/libintl/lib -L$(STAGING_DIR)/usr/lib/libicon

 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib $(SUPP_LIBS)" \
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS) $(SUPP_LIBS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		LIBLTDL="$(STAGING_DIR)/usr/lib/libltdl.la" \
 		X_CFLAGS="" \
--- a/sound/shell-fm/Makefile
+++ b/sound/shell-fm/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.
@ -40,9 +40,9 @@ endef
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) -I./include/ -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		CFLAGS="$(TARGET_CFLAGS) -I./include/ $(TARGET_CPPFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lmad -lao" \
+		LDFLAGS="$(TARGET_LDFLAGS) -lmad -lao" \
 		all install
 endef

--- a/sound/streamripper/Makefile
+++ b/sound/streamripper/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.
@ -30,7 +30,8 @@ define Package/streamripper/description
 endef


-EXTRA_CFLAGS += -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
+EXTRA_CFLAGS += $(TARGET_CPPFLAGS)
+
 define Build/Configure
 	$(call Build/Configure/Default, \
 		--without-ogg \
--- a/utils/at/Makefile
+++ b/utils/at/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,8 @@ endef

 export SENDMAIL=/bin/true
 EXTRA_CFLAGS:=-DNEED_YYWRAP -I$(PKG_BUILD_DIR) -I$(STAGING_DIR)/usr/include/libelf \
-		-L$(STAGING_DIR)/usr/lib
+	$(TARGET_LDFLAGS)
+
 CONFIGURE_ARGS+=--with-daemon_username=nobody \
 		--with-daemon_groupname=nogroup \
 		--with-jobdir=/var/spool/cron/atjobs \
--- a/utils/avrusbboot/Makefile
+++ b/utils/avrusbboot/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.
@ -40,8 +40,8 @@ endef

 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)/software \
-		CXX="$(TARGET_CROSS)g++ $(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++ -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/uClibc++" \
-		LFLAGS="-L$(STAGING_DIR)/usr/lib -nodefaultlibs -luClibc++ -lusb $(LIBGCC_S)" \
+		CXX="$(TARGET_CROSS)g++ $(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++ $(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/uClibc++" \
+		LFLAGS="$(TARGET_LDFLAGS) -nodefaultlibs -luClibc++ -lusb $(LIBGCC_S)" \
 		all
 endef

--- a/utils/bandwidthd/Makefile
+++ b/utils/bandwidthd/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.
@ -38,8 +38,8 @@ CONFIGURE_ARGS += \
 	ac_cv_file__usr_local_pgsql_include=no \
 	ac_cv_lib_pq_PQconnectdb=no \

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

 define Package/bandwidthd/install
 	$(INSTALL_DIR) $(1)/usr/sbin
--- a/utils/bemused/Makefile
+++ b/utils/bemused/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.
@ -38,7 +38,7 @@ define Build/Compile
 	CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS)" \
 	LDFLAGS="$(TARGET_LDFLAGS) " \
 	CPPFLAGS="$(TARGET_CPPFLAGS)" \
-	INCL="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include -I$(STAGING_DIR)/usr/lib/libiconv/include" \
+	INCL="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include -I$(STAGING_DIR)/usr/lib/libiconv/include" \
 	MYLIBS="-lbluetooth -lglib -L$(STAGING_DIR)/usr/lib/libiconv/lib -liconv"
 	$(STRIP) $(PKG_BUILD_DIR)/bemusedlinuxserver
 endef
--- a/utils/bluez-utils/Makefile
+++ b/utils/bluez-utils/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,7 +46,7 @@ CONFIGURE_ARGS += \

 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib \
+		LDFLAGS="$(TARGET_LDFLAGS) \
 			-L$(STAGING_DIR)/usr/lib/libintl/lib \
 			-L$(STAGING_DIR)/usr/lib/libiconv/lib" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
--- a/utils/digitemp/Makefile
+++ b/utils/digitemp/Makefile
@ -35,9 +35,9 @@ endef
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) -DLINUX -I$(STAGING_DIR)/usr/include \
+		CFLAGS="$(TARGET_CFLAGS) -DLINUX $(TARGET_CPPFLAGS) \
 			-I./src -I./userial -DOWUSB" \
-		LIBS="-L$(STAGING_DIR)/usr/lib -lusb -lm" \
+		LIBS="$(TARGET_LDFLAGS) -lusb -lm" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		ds2490
 endef
--- a/utils/huaweiaktbbo/Makefile
+++ b/utils/huaweiaktbbo/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.
@ -27,8 +27,8 @@ define Build/Prepare
 endef

 define Build/Compile
-	$(TARGET_CC) $(TARGET_CFLAGS) -I $(STAGING_DIR)/usr/include \
-		-lusb -L$(STAGING_DIR)/usr/lib/ \
+	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) \
+		-lusb \
 		-o $(PKG_BUILD_DIR)/huaweiAktBbo \
 		$(PKG_BUILD_DIR)/huaweiAktBbo.c
 endef
--- a/utils/lcd4linux/Makefile
+++ b/utils/lcd4linux/Makefile
@ -1,5 +1,5 @@
 #
-# 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.
@ -193,8 +193,8 @@ endif
 ## TODO PYTHON PLUGIN, DEPENDS on ver >= '2.1.0'


-EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/lib/libiconv/include
-EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libiconv/lib
+EXTRA_CFLAGS+= $(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/lib/libiconv/include
+EXTRA_LDFLAGS+= $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libiconv/lib

 TARGET_CONFIGURE_OPTS+=\
 	CC="$(TARGET_CC) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)"
--- a/utils/logrotate/Makefile
+++ b/utils/logrotate/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.
@ -40,8 +40,8 @@ define Package/logrotate/conffiles
 /etc/logrotate.conf
 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/utils/mg/Makefile
+++ b/utils/mg/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.
@ -43,7 +43,7 @@ endef
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		LDFLAGS="$(TARGET_LDFLAGS) -lncurses" \
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
 		CC=$(TARGET_CC)
 endef

--- a/Show More
+++ b/Show More