[packages] massive change: replace occurences of -I$(STAGING_DIR)/{include,usr/include} and -L$(STAGING_DIR)/{lib,usr/lib} with $(TARGET_CPPFLAGS) and $(TARGET_LDFLAGS) respectively
git-svn-id: svn://svn.openwrt.org/openwrt/packages@15480 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@ -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, \
|
||||
|
@ -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="" \
|
||||
|
@ -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
|
||||
|
||||
|
@ -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 \
|
||||
|
Reference in New Issue
Block a user