From 422ce6536b6d45e4632d526ae04c6af0bd36e80a Mon Sep 17 00:00:00 2001 From: Will Newton Date: Wed, 2 Sep 2009 16:02:02 +0100 Subject: package: Remove unnecessary dependencies on uclibc. A C library will have been built by the toolchain makefiles, so there is no need for packages to explicitly depend on uclibc. Signed-off-by: Will Newton Signed-off-by: Peter Korsgaard --- package/multimedia/alsa-lib/alsa-lib.mk | 4 +--- package/multimedia/alsa-utils/alsa-utils.mk | 2 +- package/multimedia/asterisk/asterisk.mk | 2 +- package/multimedia/aumix/aumix.mk | 2 +- package/multimedia/festival/festival/festival.mk | 2 +- package/multimedia/festival/speech-tools/speech-tools.mk | 2 +- package/multimedia/libid3tag/libid3tag.mk | 2 +- package/multimedia/libmad/libmad.mk | 2 +- package/multimedia/libmms/libmms.mk | 2 +- package/multimedia/libogg/libogg.mk | 2 +- package/multimedia/libsndfile/libsndfile.mk | 1 - package/multimedia/libvorbis/libvorbis.mk | 4 ++-- package/multimedia/madplay/madplay.mk | 2 +- package/multimedia/mpg123/mpg123.mk | 2 +- package/multimedia/mplayer/mplayer.mk | 2 +- package/multimedia/taglib/taglib.mk | 2 -- package/multimedia/vlc/vlc.mk | 4 ---- 17 files changed, 15 insertions(+), 24 deletions(-) (limited to 'package/multimedia') diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk index ee9aa926d..5db0393ff 100644 --- a/package/multimedia/alsa-lib/alsa-lib.mk +++ b/package/multimedia/alsa-lib/alsa-lib.mk @@ -11,8 +11,6 @@ ALSA_LIB_INSTALL_TARGET = YES ALSA_LIB_CFLAGS=$(TARGET_CFLAGS) -ALSA_LIB_DEPENDENCIES = uclibc - ALSA_LIB_CONF_OPT = --enable-shared \ --enable-static \ --without-versioned @@ -30,7 +28,7 @@ endif ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y) ALSA_LIB_CONF_OPT += --with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR) ALSA_LIB_CFLAGS+=-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) -ALSA_LIB_DEPENDENCIES += libpython +ALSA_LIB_DEPENDENCIES = libpython else ALSA_LIB_CONF_OPT += --disable-python endif diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk index 9f0b5d12d..61fc9b8d4 100644 --- a/package/multimedia/alsa-utils/alsa-utils.mk +++ b/package/multimedia/alsa-utils/alsa-utils.mk @@ -72,7 +72,7 @@ $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY): $(ALSA_UTILS_DIR)/$(ALSA_UTILS_BINARY fi touch -c $@ -alsa-utils: uclibc alsa-lib ncurses $(if $(BR2_PACKAGE_LIBINTL),libintl) $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY) +alsa-utils: alsa-lib ncurses $(if $(BR2_PACKAGE_LIBINTL),libintl) $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY) alsa-utils-unpacked: $(ALSA_UTILS_DIR)/.unpacked diff --git a/package/multimedia/asterisk/asterisk.mk b/package/multimedia/asterisk/asterisk.mk index 9d50f2433..24d5cc53f 100644 --- a/package/multimedia/asterisk/asterisk.mk +++ b/package/multimedia/asterisk/asterisk.mk @@ -61,7 +61,7 @@ endif rm -f $(TARGET_DIR)/usr/sbin/astgenkey touch -c $@ -asterisk: uclibc ncurses zlib openssl mpg123 $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY) +asterisk: ncurses zlib openssl mpg123 $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY) asterisk-source: $(DL_DIR)/$(ASTERISK_SOURCE) diff --git a/package/multimedia/aumix/aumix.mk b/package/multimedia/aumix/aumix.mk index d6f5fbd38..789aafe8f 100644 --- a/package/multimedia/aumix/aumix.mk +++ b/package/multimedia/aumix/aumix.mk @@ -44,7 +44,7 @@ $(AUMIX_DIR)/src/aumix: $(AUMIX_DIR)/.configured $(TARGET_DIR)/usr/bin/aumix: $(AUMIX_DIR)/src/aumix $(MAKE) -C $(AUMIX_DIR) DESTDIR=$(TARGET_DIR) install -aumix: uclibc ncurses $(TARGET_DIR)/usr/bin/aumix +aumix: ncurses $(TARGET_DIR)/usr/bin/aumix aumix-source: $(DL_DIR)/$(AUMIX_SOURCE) diff --git a/package/multimedia/festival/festival/festival.mk b/package/multimedia/festival/festival/festival.mk index 1762fcfa7..1c4fa7ea8 100644 --- a/package/multimedia/festival/festival/festival.mk +++ b/package/multimedia/festival/festival/festival.mk @@ -15,7 +15,7 @@ FESTIVAL_CONF_OPT = --prefix=/usr --libdir=/usr/share/festival/lib FESTIVAL_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) -FESTIVAL_DEPENDENCIES = uclibc alsa-lib speech-tools +FESTIVAL_DEPENDENCIES = alsa-lib speech-tools $(eval $(call AUTOTARGETS,package/multimedia/festival,festival)) diff --git a/package/multimedia/festival/speech-tools/speech-tools.mk b/package/multimedia/festival/speech-tools/speech-tools.mk index c757bf8ff..fa345e3c6 100644 --- a/package/multimedia/festival/speech-tools/speech-tools.mk +++ b/package/multimedia/festival/speech-tools/speech-tools.mk @@ -14,7 +14,7 @@ SPEECH_TOOLS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) STRIP=$(TARGET_STRIP) in SPEECH_TOOLS_CONF_OPT = SPEECH_TOOLS_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) -SPEECH_TOOLS_DEPENDENCIES = uclibc ncurses +SPEECH_TOOLS_DEPENDENCIES = ncurses $(eval $(call AUTOTARGETS,package/multimedia/festival,speech-tools)) diff --git a/package/multimedia/libid3tag/libid3tag.mk b/package/multimedia/libid3tag/libid3tag.mk index 0308f0229..2661e0d47 100644 --- a/package/multimedia/libid3tag/libid3tag.mk +++ b/package/multimedia/libid3tag/libid3tag.mk @@ -46,7 +46,7 @@ $(TARGET_DIR)/$(LIBID3TAG_TARGET_BIN): $(STAGING_DIR)/$(LIBID3TAG_TARGET_BIN) cp -dpf $(STAGING_DIR)/usr/lib/libid3tag.so* $(TARGET_DIR)/usr/lib/ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libid3tag.so* -libid3tag: uclibc zlib $(TARGET_DIR)/$(LIBID3TAG_TARGET_BIN) +libid3tag: zlib $(TARGET_DIR)/$(LIBID3TAG_TARGET_BIN) libid3tag-source: $(DL_DIR)/$(LIBID3TAG_SOURCE) diff --git a/package/multimedia/libmad/libmad.mk b/package/multimedia/libmad/libmad.mk index 4d9200dc0..f8663ce4a 100644 --- a/package/multimedia/libmad/libmad.mk +++ b/package/multimedia/libmad/libmad.mk @@ -57,7 +57,7 @@ $(TARGET_DIR)/usr/lib/libmad.a: $(STAGING_DIR)/usr/lib/libmad.so.0 cp -dpf $(STAGING_DIR)/usr/lib/libmad.so $(TARGET_DIR)/usr/lib/ cp -dpf $(STAGING_DIR)/usr/lib/libmad.a $(TARGET_DIR)/usr/lib/ -libmad: uclibc $(TARGET_DIR)/usr/lib/libmad.so.0 +libmad: $(TARGET_DIR)/usr/lib/libmad.so.0 libmad-headers: $(TARGET_DIR)/usr/lib/libmad.a diff --git a/package/multimedia/libmms/libmms.mk b/package/multimedia/libmms/libmms.mk index a866fadd6..2cf89d575 100644 --- a/package/multimedia/libmms/libmms.mk +++ b/package/multimedia/libmms/libmms.mk @@ -12,6 +12,6 @@ LIBMMS_LIBTOOL_PATCH = NO LIBMMS_INSTALL_STAGING = YES LIBMMS_INSTALL_TARGET = YES -LIBMMS_DEPENDENCIES = uclibc host-pkgconfig libglib2 +LIBMMS_DEPENDENCIES = host-pkgconfig libglib2 $(eval $(call AUTOTARGETS,package/multimedia,libmms)) diff --git a/package/multimedia/libogg/libogg.mk b/package/multimedia/libogg/libogg.mk index 6c88da10e..1608c383c 100644 --- a/package/multimedia/libogg/libogg.mk +++ b/package/multimedia/libogg/libogg.mk @@ -10,6 +10,6 @@ LIBOGG_AUTORECONF = NO LIBOGG_INSTALL_STAGING = YES LIBOGG_INSTALL_TARGET = YES -LIBOGG_DEPENDENCIES = uclibc host-pkgconfig +LIBOGG_DEPENDENCIES = host-pkgconfig $(eval $(call AUTOTARGETS,package/multimedia,libogg)) diff --git a/package/multimedia/libsndfile/libsndfile.mk b/package/multimedia/libsndfile/libsndfile.mk index cac30cc90..acc0d1c65 100644 --- a/package/multimedia/libsndfile/libsndfile.mk +++ b/package/multimedia/libsndfile/libsndfile.mk @@ -8,6 +8,5 @@ LIBSNDFILE_SOURCE:=libsndfile-$(LIBSNDFILE_VERSION).tar.gz LIBSNDFILE_SITE:=http://www.mega-nerd.com/libsndfile LIBSNDFILE_LIBTOOL_PATCH:=NO LIBSNDFILE_INSTALL_STAGING:=YES -LIBSNDFILE_DEPENDENCIES:=uclibc $(eval $(call AUTOTARGETS,package/multimedia,libsndfile)) diff --git a/package/multimedia/libvorbis/libvorbis.mk b/package/multimedia/libvorbis/libvorbis.mk index a8817268f..a84fa845f 100644 --- a/package/multimedia/libvorbis/libvorbis.mk +++ b/package/multimedia/libvorbis/libvorbis.mk @@ -15,7 +15,7 @@ LIBVORBIS_INSTALL_TARGET = YES LIBVORBIS_CONF_OPT = --disable-oggtest -LIBVORBIS_DEPENDENCIES = uclibc host-pkgconfig libogg +LIBVORBIS_DEPENDENCIES = host-pkgconfig libogg $(eval $(call AUTOTARGETS,package/multimedia,libvorbis)) @@ -83,7 +83,7 @@ $(TARGET_DIR)/usr/lib/tremor.a: $(TARGET_DIR)/usr/lib/tremor.so cp -dpf $(TREMOR_DIR)/lib/tremor.a $(TARGET_DIR)/usr/lib/ touch $@ -tremor libvorbis: uclibc host-pkgconfig host-autoconf host-automake libogg $(TARGET_DIR)/usr/lib/tremor.so +tremor libvorbis: host-pkgconfig host-autoconf host-automake libogg $(TARGET_DIR)/usr/lib/tremor.so tremor-source libvorbis-source: $(DL_DIR)/$(TREMOR_SOURCE) diff --git a/package/multimedia/madplay/madplay.mk b/package/multimedia/madplay/madplay.mk index d8219b727..ca46c824b 100644 --- a/package/multimedia/madplay/madplay.mk +++ b/package/multimedia/madplay/madplay.mk @@ -52,7 +52,7 @@ $(TARGET_DIR)/$(MADPLAY_TARGET_BIN): $(MADPLAY_DIR)/$(MADPLAY_BIN) $(INSTALL) -D $(MADPLAY_DIR)/$(MADPLAY_BIN) $(TARGET_DIR)/$(MADPLAY_TARGET_BIN) $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(MADPLAY_TARGET_BIN) -madplay: uclibc $(MADPLAY_ALSA_DEP) libmad libid3tag $(TARGET_DIR)/$(MADPLAY_TARGET_BIN) +madplay: $(MADPLAY_ALSA_DEP) libmad libid3tag $(TARGET_DIR)/$(MADPLAY_TARGET_BIN) madplay-clean: rm -f $(TARGET_DIR)/$(MADPLAY_TARGET_BIN) diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk index 286f43b80..9e9f0d5f3 100644 --- a/package/multimedia/mpg123/mpg123.mk +++ b/package/multimedia/mpg123/mpg123.mk @@ -53,7 +53,7 @@ $(TARGET_DIR)/$(MPG123_TARGET_BIN): $(MPG123_DIR)/$(MPG123_BIN) $(INSTALL) -D $(MPG123_DIR)/$(MPG123_BIN) $(TARGET_DIR)/$(MPG123_TARGET_BIN) $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(MPG123_TARGET_BIN) -mpg123: uclibc $(MPG123_ALSA_DEP) $(TARGET_DIR)/$(MPG123_TARGET_BIN) +mpg123: $(MPG123_ALSA_DEP) $(TARGET_DIR)/$(MPG123_TARGET_BIN) mpg123-unpacked: $(MPG123_DIR)/.unpacked diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk index dd0d0abec..3d56ee007 100644 --- a/package/multimedia/mplayer/mplayer.mk +++ b/package/multimedia/mplayer/mplayer.mk @@ -76,7 +76,7 @@ $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY): $(MPLAYER_DIR)/$(MPLAYER_BINARY) -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY) touch -c $@ -mplayer: uclibc $(if $(BR2_PACKAGE_LIBMAD),libmad) $(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib) $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY) +mplayer: $(if $(BR2_PACKAGE_LIBMAD),libmad) $(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib) $(TARGET_DIR)/$(MPLAYER_TARGET_BINARY) mplayer-source: $(DL_DIR)/$(MPLAYER_SOURCE) diff --git a/package/multimedia/taglib/taglib.mk b/package/multimedia/taglib/taglib.mk index 3187f85c0..2620b971a 100644 --- a/package/multimedia/taglib/taglib.mk +++ b/package/multimedia/taglib/taglib.mk @@ -9,8 +9,6 @@ TAGLIB_SITE = http://developer.kde.org/~wheeler/files/src TAGLIB_LIBTOOL_PATCH = NO TAGLIB_INSTALL_STAGING = YES -TAGLIB_DEPENDENCIES = uclibc - TAGLIB_CONF_ENV = \ DO_NOT_COMPILE='bindings tests examples' \ ac_cv_header_cppunit_extensions_HelperMacros_h=no \ diff --git a/package/multimedia/vlc/vlc.mk b/package/multimedia/vlc/vlc.mk index b448e9414..ade429787 100644 --- a/package/multimedia/vlc/vlc.mk +++ b/package/multimedia/vlc/vlc.mk @@ -10,9 +10,5 @@ VLC_AUTORECONF = NO VLC_INSTALL_STAGING = NO VLC_INSTALL_TARGET = YES -VLC_CONF_OPT = - -VLC_DEPENDENCIES = uclibc - $(eval $(call AUTOTARGETS,package/multimedia,vlc)) -- cgit v1.2.3