bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@15480 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico
2009-04-29 12:56:17 +00:00
parent 9c94ea0e32
commit f907dabbe7
106 changed files with 272 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/apr-util/Makefile
View File

@ -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

6
libs/db/Makefile
View File

@ -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) \

4
libs/iksemel/Makefile
View File

@ -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

6
libs/libdlna/Makefile
View File

@ -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 \

4
libs/libnetfilter-log/Makefile
View File

@ -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

4
libs/libnetfilter-queue/Makefile
View File

@ -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

4
libs/libnids/Makefile
View File

@ -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

4
libs/libshout/Makefile
View File

@ -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 \
)

6
libs/sqlite2/Makefile
View File

@ -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

4
libs/sqlite3/Makefile
View File

@ -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) \

6
libs/st2205tool/Makefile
View File

@ -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