From 9143f3a5d2f89c1156ec4614895ff116493ad03a Mon Sep 17 00:00:00 2001 From: mirko Date: Tue, 20 Apr 2010 17:20:13 +0000 Subject: [PATCH] there's no code of libdlna/ushare using libfaad2, so prevent linking against - use PKG_INSTALL git-svn-id: svn://svn.openwrt.org/openwrt/packages@21056 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- libs/libdlna/Makefile | 11 +++-------- multimedia/ushare/Makefile | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/libs/libdlna/Makefile b/libs/libdlna/Makefile index 1968dc477..a2b6989a8 100644 --- a/libs/libdlna/Makefile +++ b/libs/libdlna/Makefile @@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://libdlna.geexbox.org/releases/ PKG_MD5SUM:=2c974f95b711e5fd07f78fc4ebfcca66 +PKG_INSTALL:=1 + include $(INCLUDE_DIR)/package.mk define Package/libdlna @@ -37,7 +39,7 @@ define Build/Configure # this is *NOT* GNU configure ( cd $(PKG_BUILD_DIR); \ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS) -lfaad -lpthread -lz" \ + LDFLAGS="$(TARGET_LDFLAGS) -lpthread -lz" \ HOST_CC="$(HOSTCC)" \ ./configure \ --cross-compile \ @@ -53,13 +55,6 @@ endef TARGET_CFLAGS += $(FPIC) -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - INSTALL="install" \ - all install -endef - define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/dlna.h $(1)/usr/include/ diff --git a/multimedia/ushare/Makefile b/multimedia/ushare/Makefile index 6e2a1e979..e2a7a5c45 100644 --- a/multimedia/ushare/Makefile +++ b/multimedia/ushare/Makefile @@ -35,7 +35,7 @@ define Build/Configure # this is *NOT* GNU configure ( cd $(PKG_BUILD_DIR); \ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS) -lfaad -lpthread -lavcodec -lavformat -lavutil -lz" \ + LDFLAGS="$(TARGET_LDFLAGS) -lpthread -lavcodec -lavformat -lavutil -lz" \ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \ ./configure \ -- 2.11.0