[packages] massive change: replace occurences of -I$(STAGING_DIR)/{include,usr/includ...

SVN-Revision: 15480

diff --git a/Xorg/app/eterm/Makefile b/Xorg/app/eterm/Makefile
index 74d5491c31cc8ff49a9e97c5f3ae72a25672616e..5ffebc05eabd6680d23d24b9b96d06807c5a3bd5 100644 (file)
--- 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
 

diff --git a/Xorg/app/xine-ui/Makefile b/Xorg/app/xine-ui/Makefile
index ffbf67fcb34541ace1b9cccefcc65a3173f93c30..a40035327ab239a20b6df468633d2965eea04c8a 100644 (file)
--- 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
 

diff --git a/Xorg/lib/cairo/Makefile b/Xorg/lib/cairo/Makefile
index f455b45d862132d16674da4a7b4633d17b5560ae..44916e295d471ee536ce611ad3ddbe741a3d054e 100644 (file)
--- 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/

diff --git a/Xorg/lib/gtk2/Makefile b/Xorg/lib/gtk2/Makefile
index 2eaa87af89783a270f7633d8ed9edf18b22aaf88..598dfbd3312c90289fd06bf65d0c266c44db4d85 100644 (file)
--- 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)
 

diff --git a/Xorg/lib/libast/Makefile b/Xorg/lib/libast/Makefile
index 07b107d4fb4b6067604b39e69555165a862bbe03..6cc0ca180c83fe703551202deb493f2748ef47b9 100644 (file)
--- 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
 

diff --git a/Xorg/wm/matchbox-window-manager/Makefile b/Xorg/wm/matchbox-window-manager/Makefile
index f81e49e22932809b8478e4fef33e6d746611b7ca..06509ffdc852330bfb0266ca9df6926ad65c8cfb 100644 (file)
--- 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 

diff --git a/Xorg/xorg/app/fontconfig/Makefile b/Xorg/xorg/app/fontconfig/Makefile
index 1e5eea896f6e0bfae3d4860fb12cfc5a2c87e457..747a682977a2b2f8b253dc9f9f81bd67d93966b6 100644 (file)
--- 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
 

diff --git a/Xorg/xorg/driver/template.mk b/Xorg/xorg/driver/template.mk
index b4545c53cc4be46bd0ca1a00c6e4f19c98f0b13a..ac67d2466aeb55c2fa064d00b5fe5b8d29066662 100644 (file)
--- 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)
 

diff --git a/Xorg/xorg/driver/xf86-video-ati/Makefile b/Xorg/xorg/driver/xf86-video-ati/Makefile
index 17ff63fd0b28b3c5eeda7241618936f865e9e2f9..01ce18de3264655c9c92d28ac6dadccca8215811 100644 (file)
--- 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)
 

diff --git a/Xorg/xorg/driver/xf86-video-intel/Makefile b/Xorg/xorg/driver/xf86-video-intel/Makefile
index 050262223dc03067b740ba80b23160ddaa989507..f755ec53c634d6312ef98d1b4bf7e0f9094073b4 100644 (file)
--- 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)
 

diff --git a/Xorg/xorg/driver/xf86-video-nv/Makefile b/Xorg/xorg/driver/xf86-video-nv/Makefile
index 05e219730670b0dc08cc9746230c11f2ddb28235..bfe7cfe7fe1f2ee1c889ce16d5b2b175be51f7e4 100644 (file)
--- 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)
 

diff --git a/admin/gkrellmd/Makefile b/admin/gkrellmd/Makefile
index e99cf8b3721b8c7470dd952719f5364a8a046345..a12ff11ddebed441bbaa49eb178f0c02865af1de 100644 (file)
--- 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
 

diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile
index e1a45f31a780e526712f96e36306471cefd55528..f84ed5e5dc5d3fa396ed45ec4289e68e67b8a65a 100644 (file)
--- 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
 

diff --git a/ipv6/dhcp6/Makefile b/ipv6/dhcp6/Makefile
index a879393821b2285efb4cab1a89c5f9cda565366b..82c970c959df474629a010600bdf83fc3fa07c86 100644 (file)
--- 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

diff --git a/ipv6/gw6c/Makefile b/ipv6/gw6c/Makefile
index 6f09a06e58d061e13f5aa9b141afa1d6e9ab9104..5834b58adb78be3914d5befa499829de32c15f06 100644 (file)
--- 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

diff --git a/ipv6/send/Makefile b/ipv6/send/Makefile
index 9d045c51fde841b89ffc103ecb627429f412a36e..934cb19ec675ba2bfd2ae19cf0ff46e13b31f4a1 100644 (file)
--- 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

diff --git a/lang/jamvm/Makefile b/lang/jamvm/Makefile
index 01d0cdccdb4e3a22c95233472216d6208cc56416..1badb38a82f18a8bd202f1eda4175e11dfba9455 100644 (file)
--- 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
 

diff --git a/lang/luaexpat/Makefile b/lang/luaexpat/Makefile
index b8066e554c634c7d9132b3a8bcf95b47a30559c8..05dd6573e135566ecd1486f35e1b0c1c78015038 100644 (file)
--- 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

diff --git a/lang/luafilesystem/Makefile b/lang/luafilesystem/Makefile
index 2458b321e92b83c99f8bc76025308fc24e54bbde..d9dbea08b7e6aab6bf78efb02dea9b8887b97a6c 100644 (file)
--- 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
 

diff --git a/lang/luaprofiler/Makefile b/lang/luaprofiler/Makefile
index c7fa5b1ae310120a23dcb4a0204a13d1d1a6a868..e5f202dc76bb7ce3a26cab1ae10d6578678ce00a 100644 (file)
--- 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
 

diff --git a/lang/luasec/Makefile b/lang/luasec/Makefile
index 0b2d478047e211155079706d8b41ff5d162bc865..e7dbef7b9457c81cd3d4ea1214cad82762fc7103 100644 (file)
--- a/lang/luasec/Makefile
+++ b/lang/luasec/Makefile
@@ -35,10 +35,10 @@ endef
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR)/src linux \
-       INCDIR="-I$(STAGING_DIR)/usr/include/" \
-       LIBDIR="-L$(STAGING_DIR)/usr/lib/" \
-       CC="$(TARGET_CC) $(TARGET_CFLAGS)" \
-       LD="$(TARGET_CROSS)ld -shared" 
+               INCDIR="$(TARGET_CPPFLAGS)" \
+               LIBDIR="$(TARGET_LDFLAGS)" \
+               CC="$(TARGET_CC) $(TARGET_CFLAGS)" \
+               LD="$(TARGET_CROSS)ld -shared" 
 endef
 
 

diff --git a/lang/luasocket/Makefile b/lang/luasocket/Makefile
index bc414934054ea2746ab99200c33d4c64a647f3e2..d2673c2458f3590b3bd6b6a898341b25e097afcf 100644 (file)
--- 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
 

diff --git a/lang/perl/Makefile b/lang/perl/Makefile
index 012a2e25c2cb5a71c50bf1f6ee2ebfb402d79eba..57104f9cd398c50becb68277941c6ad34d467ebb 100644 (file)
--- 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 \

diff --git a/libs/apr-util/Makefile b/libs/apr-util/Makefile
index f52460d8d2ca22184096ca836fc9f9700b88d029..acef9e237b148ff2b9a4f9b4b6bf7789fe7b4296 100644 (file)
--- 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
 

diff --git a/libs/db/Makefile b/libs/db/Makefile
index d3a531cfb294511fcaed4daaec3b824aeddea0e4..c1e0fd58068faa2e8de6de0c293333da5e3fe947 100644 (file)
--- 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) \

diff --git a/libs/iksemel/Makefile b/libs/iksemel/Makefile
index 295eefa7cf30eabbbf5c692a81f28883ab54ee5b..deaecaacea617b693f5ac670df7ded854473608c 100644 (file)
--- 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

diff --git a/libs/libdlna/Makefile b/libs/libdlna/Makefile
index ef80f5d7a2c92a114a50e62978fca2b1bbea83a6..a8e9f51b638d1dde40f6aebf10bb484c72d4d131 100644 (file)
--- 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 \

diff --git a/libs/libnetfilter-log/Makefile b/libs/libnetfilter-log/Makefile
index aa9c23518c86573aec7211c192751453742e1eaf..0f429eb116f8f7d2775bf136415c21e31f019a08 100644 (file)
--- 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

diff --git a/libs/libnetfilter-queue/Makefile b/libs/libnetfilter-queue/Makefile
index 0f62e4f390bd854e214f32f6bb70359a4b0c36fe..0b1560a97a8e24a4c05ca17ff24359900dc74899 100644 (file)
--- 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

diff --git a/libs/libnids/Makefile b/libs/libnids/Makefile
index 238122f67a9cc2502d79f3aed2d8302a7c2aa04c..13f8eabda8fcc992883757f4a8ec40cf36f4ae42 100644 (file)
--- 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

diff --git a/libs/libshout/Makefile b/libs/libshout/Makefile
index bd2e3e26e389b91bd98d859e97132d47b8b1122b..142f2d96a5bef492ffa17e92cc78a82807dc6d4b 100644 (file)
--- 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 \
        )

diff --git a/libs/sqlite2/Makefile b/libs/sqlite2/Makefile
index 3af3e7d728d2bf2ea864dc8b3586e5cd049138dc..44a90fdce9e11c27e5da0db06f9a4e656d758274 100644 (file)
--- 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

diff --git a/libs/sqlite3/Makefile b/libs/sqlite3/Makefile
index 246d2cc26edbd415ddf374876dc744dd3ecaa259..bdc9dd45fd1c247fc384576d1431421b6921ee44 100644 (file)
--- 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) \

diff --git a/libs/st2205tool/Makefile b/libs/st2205tool/Makefile
index 32a28a4125a45985f47586502d9a8ac748cfb6a2..2e5e7b5304495f6ad3eaefa544576391857cd876 100644 (file)
--- 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

diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile
index f555e8673482f94ac67c5a54397781ecba3ad489..e44c6c6a9cca73a1e918fc9890aa335a1d8a67d1 100644 (file)
--- 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

diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile
index 5dff3d2118cf5443de41c2dccb104020396773e8..ded1a32980d45c9083a2c0809916fa81cdbe1b75 100644 (file)
--- 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

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 0558892d63a2b4b23fe33d9ec8c51ddf22263d54..21369055b36b1abe4b2b47728bb4b325e2547d4c 100644 (file)
--- 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)" \

diff --git a/multimedia/kissdx/Makefile b/multimedia/kissdx/Makefile
index a3263873f388b98d0201fbc5838d88c3f4ff8c69..0e9bc2a2ce0023f1608fd4b92452d832e695e8d3 100644 (file)
--- 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

diff --git a/multimedia/mjpg-streamer/Makefile b/multimedia/mjpg-streamer/Makefile
index 6004f5aa073302dd0474a84691d83a718dd9f095..bc72afb3ecda96f16afafa037577819f15912112 100644 (file)
--- 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

diff --git a/multimedia/palantir/Makefile b/multimedia/palantir/Makefile
index 3ff6b5b05a1b6e606e3d13d36d606c9dccbbb0b3..d80ac507e302cc891f15db77543e76f878ca897c 100644 (file)
--- 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 \

diff --git a/multimedia/ushare/Makefile b/multimedia/ushare/Makefile
index 3b2773e6967c4fd9e26b540287ac40666520426d..6e2a1e979d7672b51bf0c1a051fb120c2277641a 100644 (file)
--- 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 \

diff --git a/net/aircrack-ng/Makefile b/net/aircrack-ng/Makefile
index 22ba8a9ad9a9db247deef5955a6abc023981c604..7ba727bd1e69883a714d8dbc5558c901f2ba3365 100644 (file)
--- 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 \

diff --git a/net/amwall/Makefile b/net/amwall/Makefile
index 5492265ac7aa26770a37e5e9863597dd73edbae8..ac9d1cc66070526664cd50584db2a2a643198b21 100644 (file)
--- 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)" \

diff --git a/net/arpd/Makefile b/net/arpd/Makefile
index d2331b56b18aa98e4fa9d7c6aa24877727d4cfc4..88598fe22edf8338aa552bfd4c7df69d31145548 100644 (file)
--- 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

diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile
index 1b2ca34423cff0dbff252a26c29f374d3b525439..08724e4b3e423c8df68b99b0eb158064d273c129 100644 (file)
--- 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

diff --git a/net/bitchx/Makefile b/net/bitchx/Makefile
index a96ae1a83368ff78ef73cf5bee1f0e24edd067f8..e8bcae490d7e55a46392a8ae70a6c78d61c75abd 100644 (file)
--- 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

diff --git a/net/bitlbee/Makefile b/net/bitlbee/Makefile
index ceda72489aa545a434835c012944b20c00a3c2e4..84a509191e55d58ed6999669715cad61e82bb165 100644 (file)
--- 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

diff --git a/net/click/Makefile b/net/click/Makefile
index 1bd439895f2486a5a9f8cf7d7355e4bf53ae870a..4390ee93714c8135053562dc6e35cbc0748709da 100644 (file)
--- 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 \

diff --git a/net/cups/Makefile b/net/cups/Makefile
index c8cd6d2806b5c442945e27d9af4871a24ab170e6..a50ff78eabcf70ba9ebc3a7d1c465a2b8228b5b7 100644 (file)
--- 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
 

diff --git a/net/dansguardian/Makefile b/net/dansguardian/Makefile
index 61fe44c07d98feeb3fedd658425770d3642b27ba..16f4d1c1d68af57eedfb30cad2c163074abaf4ce 100644 (file)
--- 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)" \
 

diff --git a/net/dsl-qos-queue/Makefile b/net/dsl-qos-queue/Makefile
index dc312f917ffa281feed1d8a1ca69707de3d22616..67d9392def7fc3a767950f54fb1060b92778ce46 100644 (file)
--- 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

diff --git a/net/elinks/Makefile b/net/elinks/Makefile
index 29ba4f509502a99f90231a90d6d7af5d02a0220b..765326d3e743dc03e2d4e00a4385612508da3540 100644 (file)
--- 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) \

diff --git a/net/faifa/Makefile b/net/faifa/Makefile
index 800e3263685f201ab2b20665b657fdb63e1d5684..79179c4e6db2b070c008048c7f2d302aa364a6ad 100644 (file)
--- 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

diff --git a/net/httping/Makefile b/net/httping/Makefile
index 441fa71898d8e48cd96d64ecabd6d46474088428..695a2d76c57f937a4103494834c3fbab9c436f72 100644 (file)
--- 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
 

diff --git a/net/icecast/Makefile b/net/icecast/Makefile
index 6dd15fd8294d941bea354ba2eac9082e3be3a63c..82431eb3a32a9ed7697fe5f77fe96f9578ed5776 100644 (file)
--- 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
 

diff --git a/net/imspector/Makefile b/net/imspector/Makefile
index 2bd2b42662275148d8846d1c3946eab40d2d4192..38bfb4b5422a63016c4cd903fbb717a201dd5a82 100644 (file)
--- 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
 

diff --git a/net/iodine/Makefile b/net/iodine/Makefile
index 6de4645054507f595bbe43c4e8c557ff14135e4c..b324f9b99e8f7add14619ebba5bbf9df14e7ecdb 100644 (file)
--- 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

diff --git a/net/iptraf/Makefile b/net/iptraf/Makefile
index 1f82f7d28ca3bb806fb186131950fc017d8cf158..a20959c8e1785eb31761f8bf250a39a719f25d6d 100644 (file)
--- 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" \

diff --git a/net/irssi/Makefile b/net/irssi/Makefile
index 0458913829bc6d80670cef1d1a50c39538d90ee6..5394ae82e6b91e425a80ee09b3a41470a30bed72 100644 (file)
--- 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),)

diff --git a/net/karma/Makefile b/net/karma/Makefile
index e0e3ff85355b4fcc3e8cd299029e19e7db5876ef..fad31b3cd2c61086457aa694519a18e3ca3a6dc4 100644 (file)
--- 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   

diff --git a/net/leafnode/Makefile b/net/leafnode/Makefile
index 24c9456b2dbc268653b10806f71dd09583a4afc2..7444ead6d94442dfd4f088074fa54bda5eb4933c 100644 (file)
--- 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
 

diff --git a/net/miax/Makefile b/net/miax/Makefile
index 9d58c1b8b0e59c0e1e6361ab3c3f98d676076928..4b3ceec8f61c85bac83026cde54b510a047931e6 100644 (file)
--- 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
 

diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index 1b41109ba0939cfbad4002e86559828da69dab2e..161e02d325668dea3b70854c83dff4a5397611d1 100644 (file)
--- 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
 

diff --git a/net/nagios/Makefile b/net/nagios/Makefile
index f64b0062a348bf039daddba3d1f9b135060d0a39..b9907b37ad75eaecc0bc96b62a3ac748b7202728 100644 (file)
--- 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" \

diff --git a/net/natpmp/Makefile b/net/natpmp/Makefile
index f4091dc18673bc4938abc8784fe62221b5abbdb8..91d20c2feea3bc52dd269cf58009724b511e7db6 100644 (file)
--- 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
 

diff --git a/net/nbd/Makefile b/net/nbd/Makefile
index 229a2f18b133c7783d9adcf95b05649ac79d2e94..431e57bd522a6a6586d905ae9d73d1cb689ff134 100644 (file)
--- 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
 

diff --git a/net/ngrep/Makefile b/net/ngrep/Makefile
index bac838ecef99ce411a939aa1135e2e2b01d32292..c02170adc33a8501d497482a61425b11cf37d13e 100644 (file)
--- 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
 

diff --git a/net/nufw/Makefile b/net/nufw/Makefile
index 3100e30b55820f53228bd2e9cbb6285bf4b3c915..385ee50272c3a20f52bb8abd6faf2877b42ac02e 100644 (file)
--- 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 \

diff --git a/net/openswan/Makefile b/net/openswan/Makefile
index e7150c356a93528b04e2d522d682d06c694dd680..c236b292c2404781abdd1fa64e3dc824e03802a1 100644 (file)
--- 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) \

diff --git a/net/pmacct/Makefile b/net/pmacct/Makefile
index 34038e3f4a092ec8d9ad97a9f8c8a3c4ae5218d0..98cd915a4427de7d36284fffd404334a6b1cfb6b 100644 (file)
--- 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)

diff --git a/net/portmap/Makefile b/net/portmap/Makefile
index 2ba9f74f886b2129c08059561ffee7ea15e41a6b..5f715cc02043b389eee4c7eab5bcc774c5514e95 100644 (file)
--- 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

diff --git a/net/privoxy/Makefile b/net/privoxy/Makefile
index ed1cb0831faeab5e5818e966ad476c09b34531a6..3e505bef3081cc8330c942134754d7542d176ac8 100644 (file)
--- 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)" \

diff --git a/net/prosody/Makefile b/net/prosody/Makefile
index 38dac00951aec89bbacb642dabcc84f7bb22d056..55fbc4bf0297f64d4bb3c8d6e07bf4b3da3f01c0 100644 (file)
--- 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 \

diff --git a/net/qolyester/Makefile b/net/qolyester/Makefile
index 212985dc05d6117abc8b37aae988f993cd92c1ed..241e42acb13ccf37a9a5a4dc69087f303bc52750 100644 (file)
--- 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.

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 20ffb61fe029d1a4100bddb7e2b572090c47395b..dc290b1f2dea9b1ab8c6972f169ffa56875352e5 100644 (file)
--- 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 \

diff --git a/net/scanlogd/Makefile b/net/scanlogd/Makefile
index 145c53ea536d5fa6be204d6eab45ca3e9bf638b0..1083ea8de24a241f880d33b20f6edd90265bb943 100644 (file)
--- 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
 

diff --git a/net/smtptrapd/Makefile b/net/smtptrapd/Makefile
index 626ba825540a61be736a621a60036df729da86fd..da0dffe24f260bd3fa431b8b785b4e8ab3bc5fe7 100644 (file)
--- 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

diff --git a/net/squid/Makefile b/net/squid/Makefile
index 1ef9434fa6c1d20bc4961bdcda7cc93f852e43f4..ec4a395dccb330bf81aa1a2399ba844fd0db948d 100644 (file)
--- 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)" \

diff --git a/net/stun/Makefile b/net/stun/Makefile
index c2397ec1a3e47550bfe283710b3c97b9b488216f..34f7df5ffd4b8d3f63d9480b7b9cb2b97cebc805 100644 (file)
--- 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
 

diff --git a/net/subversion/Makefile b/net/subversion/Makefile
index 54ef224bb4e7d883e575a6b13671238854874e76..40202d935b4f11940df1e709429cb539b0759d27 100644 (file)
--- 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

diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile
index b02c54d0c80d8fde1fe32ab787ce9f356cfee4bc..f8451a4cae0551e0c2f4f3f3e4f0c701e50793af 100644 (file)
--- 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

diff --git a/net/ulogd/Makefile b/net/ulogd/Makefile
index 5d04e20ea0c065d2f0366e5078ee532c8be0ea30..ef88a8a1dc95bd7d7d72a723ba13b5cb745a760e 100644 (file)
--- 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
 

diff --git a/net/vnstati/Makefile b/net/vnstati/Makefile
index 233790c24368fda3c2b934b1a772de69701a9129..f11b6af6397f5ecdffdc27d2a24080aff43ee838 100644 (file)
--- 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 

diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index 0d74fd148e0d246f9b511ad2e8d703ec03daaec4..6fb7a5ee2f90f4cc2fb88a7a376e0a7cecb00783 100644 (file)
--- 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" \

diff --git a/net/wiviz/Makefile b/net/wiviz/Makefile
index 50b63813ef714c8533f351cf72fcdc3488438d94..d68ef9f6c3e7fd5b460c73f75492f1d49ccc3deb 100644 (file)
--- 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, \

diff --git a/net/wknock/Makefile b/net/wknock/Makefile
index 4cb76fe13f4e0d6224704c12a4aa08acd17ac31f..96cd269532bd6368ef4bc4cae2733cf8ee0cdf94 100644 (file)
--- 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
 

diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile
index d35d9bdab257c511314fa6f0ede2edd16f4c04ac..6fb2afe9d9ef25099d0d4f2c3ed954bebe96db21 100644 (file)
--- 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, \

diff --git a/sound/pulseaudio/Makefile b/sound/pulseaudio/Makefile
index d5d62c290850e5d33b4a073f0f57339638768a5a..734ca2f3d133811454274ba67ebe2f1688d37e61 100644 (file)
--- 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="" \

diff --git a/sound/shell-fm/Makefile b/sound/shell-fm/Makefile
index 53ade2969b94d286104e316d546b9c0d45a2f6b1..9fc12770e660ecbb7dba74cf91a2cdf56a5d2ee8 100644 (file)
--- 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
 

diff --git a/sound/streamripper/Makefile b/sound/streamripper/Makefile
index e33502f7a3ab752d9d9295b3e7775bf1662b37c7..5ed45d458cf34711fc8af0cbd2ca7f91cc2d666c 100644 (file)
--- 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 \

diff --git a/utils/at/Makefile b/utils/at/Makefile
index d59680303a1918f28a45f108aaf6109818c8a163..ac1c34309eb67b8fb104ab29cab42b8807696eb6 100644 (file)
--- 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 \

diff --git a/utils/avrusbboot/Makefile b/utils/avrusbboot/Makefile
index 5b13c8e118a6ffc9657a8860354d0210691c48ad..e8a21a3223ea5febb647c4288b48bcff27f18124 100644 (file)
--- 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
 

diff --git a/utils/bandwidthd/Makefile b/utils/bandwidthd/Makefile
index 2c352b33c6c16b6a34ecb3cb98b212e95724ee4a..7669eeb349480d2bab78b534f637c2af27168c1e 100644 (file)
--- 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

diff --git a/utils/bemused/Makefile b/utils/bemused/Makefile
index 599ca648c42847a5f96f05078bba65f09f6b7062..6749124b09293f5aa000a02f2a0f7eb3b1b2da06 100644 (file)
--- 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

diff --git a/utils/bluez-utils/Makefile b/utils/bluez-utils/Makefile
index 821505c22518cc8f2faa7107b00ff20e72146f52..3ba38d6852e95a2a5a1e8c7aadf69733dce16407 100644 (file)
--- 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)" \

diff --git a/utils/digitemp/Makefile b/utils/digitemp/Makefile
index 37c4bfab3077daa4d904655bdc833b039faf934e..0a4ba64882f32cdd22c136702f77606545b80d1e 100644 (file)
--- 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

diff --git a/utils/huaweiaktbbo/Makefile b/utils/huaweiaktbbo/Makefile
index 69d3b65eda2dd800a7d6c3614c2b07c95c42ac0b..3d07a65c4844a484e191b9d173f95582fb26c1db 100644 (file)
--- 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

diff --git a/utils/lcd4linux/Makefile b/utils/lcd4linux/Makefile
index 01aa86d9f309f627f672fa1d62dd70ea2e7462d3..9bdb6a7758b42ed17114ba04b74751224bffbe15 100644 (file)
--- 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)"

diff --git a/utils/logrotate/Makefile b/utils/logrotate/Makefile
index a6059eb3eb675d2158083888b4e3538c93e969b7..53ee7205944aedab33935a86bc2fadd450e393a2 100644 (file)
--- 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, \

diff --git a/utils/mg/Makefile b/utils/mg/Makefile
index 497e9c4eae4887b9abe2c968d78da8c979257698..e3dd484b196ab75e5db191525bc2a8bffbacbf86 100644 (file)
--- 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
 

diff --git a/utils/owfs/Makefile b/utils/owfs/Makefile
index 27cdb803a26c391bca5df7c3b3988eb5032887d9..08eb2fe950d4a2d782a56ebeebb999bfd1e27bf4 100644 (file)
--- a/utils/owfs/Makefile
+++ b/utils/owfs/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.
@@ -141,8 +141,8 @@ define Build/Configure
                ./bootstrap ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
-               CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(TOOLCHAIN_DIR)/usr/lib -L$(TOOLCHAIN_DIR)/lib" \
+               CPPFLAGS="$(TARGET_CPPFLAGS)" \
+               LDFLAGS="$(TARGET_LDFLAGS)" \
                lt_sys_lib_dlsearch_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
                lt_sys_lib_search_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
                shrext_cmds=".so" \

diff --git a/utils/picocom/Makefile b/utils/picocom/Makefile
index 37b00ed147e0913cd412504a3ee6411e52808461..5dd1645dd45d1e9ecaaf601e7c73e4d9ec637a6a 100644 (file)
--- a/utils/picocom/Makefile
+++ b/utils/picocom/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 @@ endef
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
-               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)" \
                picocom
 endef
 

diff --git a/utils/pipacs/Makefile b/utils/pipacs/Makefile
index 7924fa524bf00227651d7cfa3a006ba4f00df61c..a44575729ba2fd6d589c82d977fa43826644bca8 100644 (file)
--- a/utils/pipacs/Makefile
+++ b/utils/pipacs/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,7 +28,7 @@ endef
 define Build/Compile   
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS) -I $(STAGING_DIR)/usr/include" \
+               CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
                all
 endef
 

diff --git a/utils/unzip/Makefile b/utils/unzip/Makefile
index 465e248722fe8d14c851c7df44c0fefb337f647f..ed5b3386f1611e6de1af01a4c3f1299409ca14f6 100644 (file)
--- a/utils/unzip/Makefile
+++ b/utils/unzip/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
                $(TARGET_CONFIGURE_OPTS) \
                prefix="$(PKG_INSTALL_DIR)/usr" \
                CFLAGS="$(TARGET_CFLAGS)" \
-               CF="$(TARGET_CFLAGS) -O -I$(STAGING_DIR)/usr/include -I. -DUNIX" \
-               LD="$(TARGET_CC) -L$(STAGING_DIR)/usr/lib" \
+               CF="$(TARGET_CFLAGS) -O $(TARGET_CPPFLAGS) -I. -DUNIX" \
+               LD="$(TARGET_CC) $(TARGET_LDFLAGS)" \
                install
 endef
 

diff --git a/utils/usb-modeswitch/Makefile b/utils/usb-modeswitch/Makefile
index e5455191c2bf2be27f4824a3cedd8e12a7f382e5..eb8af06023196d9926c3ef9614d44f2d7758f5f6 100644 (file)
--- a/utils/usb-modeswitch/Makefile
+++ b/utils/usb-modeswitch/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.
@@ -31,9 +31,8 @@ define Package/usb-modeswitch/description
 endef
 
 define Build/Compile
-       "$(TARGET_CC)" $(TARGET_CFLAGS) -I $(STAGING_DIR)/include/ \
-               -I $(STAGING_DIR)/usr/include/ -L $(STAGING_DIR)/lib/ \
-               -L $(STAGING_DIR)/usr/lib/ -lusb \
+       "$(TARGET_CC)" $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) \
+               -lusb \
                -o $(PKG_BUILD_DIR)/usb_modeswitch-OpenWrt \
                                $(PKG_BUILD_DIR)/usb_modeswitch.c
 endef

diff --git a/utils/zip/Makefile b/utils/zip/Makefile
index 1edb5dd8e3b4de9428a6a6ea16907ee066ac8079..dc2a8816a5bf9ccafc4ef7985976cac138e99104 100644 (file)
--- a/utils/zip/Makefile
+++ b/utils/zip/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.
@@ -43,8 +43,8 @@ define Build/Compile
                $(TARGET_CONFIGURE_OPTS) \
                prefix="$(PKG_INSTALL_DIR)/usr" \
                CFLAGS="$(TARGET_CFLAGS)" \
-               CF="$(TARGET_CFLAGS) -O -I$(STAGING_DIR)/usr/include -I. -DUNIX" \
-               LD="$(TARGET_CC) -L$(STAGING_DIR)/usr/lib" \
+               CF="$(TARGET_CFLAGS) -O $(TARGET_CPPFLAGS) -I. -DUNIX" \
+               LD="$(TARGET_CC) $(TARGET_LDFLAGS)" \
                install
 endef