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

6
Xorg/app/eterm/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.
@ -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

4
Xorg/app/xine-ui/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.
@ -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

4
Xorg/lib/cairo/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.
@ -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/

4
Xorg/lib/gtk2/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.
@ -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)

6
Xorg/lib/libast/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.
@ -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

4
Xorg/wm/matchbox-window-manager/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.
@ -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

4
Xorg/xorg/app/fontconfig/Makefile
View File

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

3
Xorg/xorg/driver/template.mk
View File

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

5
Xorg/xorg/driver/xf86-video-ati/Makefile
View File

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

5
Xorg/xorg/driver/xf86-video-intel/Makefile
View File

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

3
Xorg/xorg/driver/xf86-video-nv/Makefile
View File

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