diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2011-09-29 21:57:43 +0200 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-09-29 23:12:27 +0200 |
commit | 300f9c9c9dcf2b47ea89c45d5b1ea05e7305bd49 (patch) | |
tree | 4b06e56a40777a04ec56ba16d9b5d08fed84de08 /package/multimedia | |
parent | 0849e8193ef429f29945b8c2a54eafc8635e0969 (diff) |
package: remove useless arguments from AUTOTARGETS
Thanks to the pkgparentdir and pkgname functions, we can rewrite the
AUTOTARGETS macro in a way that avoids the need for each package to
repeat its name and the directory in which it is present.
[Peter: pkgdir->pkgparentdir]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/multimedia')
38 files changed, 38 insertions, 38 deletions
diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk index 9374037e0..62a3b1d3e 100644 --- a/package/multimedia/alsa-lib/alsa-lib.mk +++ b/package/multimedia/alsa-lib/alsa-lib.mk @@ -78,4 +78,4 @@ define ALSA_LIB_UNINSTALL_STAGING_CMDS -rm -rf $(STAGING_DIR)/usr/share/alsa endef -$(eval $(call AUTOTARGETS,package/multimedia,alsa-lib)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk index f3954200e..59579c23d 100644 --- a/package/multimedia/alsa-utils/alsa-utils.mk +++ b/package/multimedia/alsa-utils/alsa-utils.mk @@ -57,4 +57,4 @@ define ALSA_UTILS_UNINSTALL_TARGET_CMDS rm -f $(addprefix $(TARGET_DIR)/,$(ALSA_UTILS_TARGETS_) $(ALSA_UTILS_TARGETS_y)) endef -$(eval $(call AUTOTARGETS,package/multimedia,alsa-utils)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/aumix/aumix.mk b/package/multimedia/aumix/aumix.mk index 65d9d396c..b6fbdd2cd 100644 --- a/package/multimedia/aumix/aumix.mk +++ b/package/multimedia/aumix/aumix.mk @@ -18,4 +18,4 @@ AUMIX_CONF_OPT = \ AUMIX_DEPENDENCIES = ncurses -$(eval $(call AUTOTARGETS,package/multimedia,aumix)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/faad2/faad2.mk b/package/multimedia/faad2/faad2.mk index 04aee1833..366515cf7 100644 --- a/package/multimedia/faad2/faad2.mk +++ b/package/multimedia/faad2/faad2.mk @@ -8,4 +8,4 @@ FAAD2_VERSION = 2.7 FAAD2_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/faac FAAD2_INSTALL_STAGING = YES -$(eval $(call AUTOTARGETS,package/multimedia,faad2)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk index b50503b05..ca41892fc 100644 --- a/package/multimedia/ffmpeg/ffmpeg.mk +++ b/package/multimedia/ffmpeg/ffmpeg.mk @@ -172,4 +172,4 @@ define FFMPEG_CONFIGURE_CMDS ) endef -$(eval $(call AUTOTARGETS,package/multimedia,ffmpeg)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/flac/flac.mk b/package/multimedia/flac/flac.mk index 4c278b4a0..79ecfd199 100644 --- a/package/multimedia/flac/flac.mk +++ b/package/multimedia/flac/flac.mk @@ -20,4 +20,4 @@ else FLAC_CONF_OPT += --disable-ogg endif -$(eval $(call AUTOTARGETS,package/multimedia,flac)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk index ebe87dcb7..41a7f3be3 100644 --- a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk +++ b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk @@ -15,4 +15,4 @@ ifeq ($(BR2_PACKAGE_BZIP2),y) GST_FFMPEG_DEPENDENCIES += bzip2 endif -$(eval $(call AUTOTARGETS,package/multimedia,gst-ffmpeg)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk index 9b2a738c3..4cd2771a8 100644 --- a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk +++ b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk @@ -519,4 +519,4 @@ else GST_PLUGINS_BAD_CONF_OPT += --disable-vcd endif -$(eval $(call AUTOTARGETS,package/multimedia,gst-plugins-bad)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/multimedia/gst-plugins-base/gst-plugins-base.mk index a260f89a7..87ee80dc1 100644 --- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk +++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk @@ -170,4 +170,4 @@ else GST_PLUGINS_BASE_CONF_OPT += --disable-vorbis endif -$(eval $(call AUTOTARGETS,package/multimedia,gst-plugins-base)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/multimedia/gst-plugins-good/gst-plugins-good.mk index 202e60e70..c2dcd24db 100644 --- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk +++ b/package/multimedia/gst-plugins-good/gst-plugins-good.mk @@ -359,4 +359,4 @@ else GST_PLUGINS_GOOD_CONF_OPT += --disable-speex endif -$(eval $(call AUTOTARGETS,package/multimedia,gst-plugins-good)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk index c3a3d8b74..5237bc95f 100644 --- a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk +++ b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk @@ -74,4 +74,4 @@ else GST_PLUGINS_UGLY_CONF_OPT += --disable-mpeg2dec endif -$(eval $(call AUTOTARGETS,package/multimedia,gst-plugins-ugly)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/gstreamer/gstreamer.mk b/package/multimedia/gstreamer/gstreamer.mk index b1456e255..274b87a9d 100644 --- a/package/multimedia/gstreamer/gstreamer.mk +++ b/package/multimedia/gstreamer/gstreamer.mk @@ -25,4 +25,4 @@ GSTREAMER_CONF_OPT = \ GSTREAMER_DEPENDENCIES = libglib2 host-pkg-config -$(eval $(call AUTOTARGETS,package/multimedia,gstreamer)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/lame/lame.mk b/package/multimedia/lame/lame.mk index 281c1e865..7609f2db3 100644 --- a/package/multimedia/lame/lame.mk +++ b/package/multimedia/lame/lame.mk @@ -27,4 +27,4 @@ endif LAME_POST_CONFIGURE_HOOKS += LAME_BIGENDIAN_ARCH -$(eval $(call AUTOTARGETS,package/multimedia,lame)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/libao/libao.mk b/package/multimedia/libao/libao.mk index 83d31545a..617b1ee8f 100644 --- a/package/multimedia/libao/libao.mk +++ b/package/multimedia/libao/libao.mk @@ -18,4 +18,4 @@ else LIBAO_CONF_OPT += --disable-alsa endif -$(eval $(call AUTOTARGETS,package/multimedia,libao)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/libcdaudio/libcdaudio.mk b/package/multimedia/libcdaudio/libcdaudio.mk index 2f37cc24a..d240c0765 100644 --- a/package/multimedia/libcdaudio/libcdaudio.mk +++ b/package/multimedia/libcdaudio/libcdaudio.mk @@ -12,4 +12,4 @@ LIBCDAUDIO_LIBTOOL_PATCH = YES LIBCDAUDIO_INSTALL_STAGING = YES LIBCDAUDIO_INSTALL_TARGET = YES -$(eval $(call AUTOTARGETS,package/multimedia,libcdaudio)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/libcue/libcue.mk b/package/multimedia/libcue/libcue.mk index 2de042314..b815c0fbb 100644 --- a/package/multimedia/libcue/libcue.mk +++ b/package/multimedia/libcue/libcue.mk @@ -10,4 +10,4 @@ LIBCUE_SOURCE = libcue-$(LIBCUE_VERSION).tar.bz2 LIBCUE_DEPENDENCIES = flex LIBCUE_INSTALL_STAGING = YES -$(eval $(call AUTOTARGETS,package/multimedia,libcue)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/libdvdnav/libdvdnav.mk b/package/multimedia/libdvdnav/libdvdnav.mk index b3fea2fd2..4e9a92ba1 100644 --- a/package/multimedia/libdvdnav/libdvdnav.mk +++ b/package/multimedia/libdvdnav/libdvdnav.mk @@ -17,4 +17,4 @@ LIBDVDNAV_DEPENDENCIES = libdvdread # of cross compilation, we prefer using pkg-config. LIBDVDNAV_CONF_OPT = --with-dvdread-config="$(PKG_CONFIG_HOST_BINARY) dvdread" -$(eval $(call AUTOTARGETS,package/multimedia,libdvdnav)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/libdvdread/libdvdread.mk b/package/multimedia/libdvdread/libdvdread.mk index 98b2ef5c3..3f456efe1 100644 --- a/package/multimedia/libdvdread/libdvdread.mk +++ b/package/multimedia/libdvdread/libdvdread.mk @@ -12,4 +12,4 @@ LIBDVDREAD_LIBTOOL_PATCH = YES LIBDVDREAD_INSTALL_STAGING = YES LIBDVDREAD_INSTALL_TARGET = YES -$(eval $(call AUTOTARGETS,package/multimedia,libdvdread)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/libid3tag/libid3tag.mk b/package/multimedia/libid3tag/libid3tag.mk index bcb110f8c..def2dbc84 100644 --- a/package/multimedia/libid3tag/libid3tag.mk +++ b/package/multimedia/libid3tag/libid3tag.mk @@ -11,4 +11,4 @@ LIBID3TAG_INSTALL_STAGING=YES LIBID3TAG_DEPENDENCIES=zlib LIBID3TAG_LIBTOOL_PATCH=NO -$(eval $(call AUTOTARGETS,package/multimedia,libid3tag)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/libmad/libmad.mk b/package/multimedia/libmad/libmad.mk index d129aad32..a469fece1 100644 --- a/package/multimedia/libmad/libmad.mk +++ b/package/multimedia/libmad/libmad.mk @@ -32,4 +32,4 @@ LIBMAD_CONF_OPT = \ --disable-debugging \ --enable-speed -$(eval $(call AUTOTARGETS,package/multimedia,libmad)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/libmms/libmms.mk b/package/multimedia/libmms/libmms.mk index d11f0bead..50ece53fe 100644 --- a/package/multimedia/libmms/libmms.mk +++ b/package/multimedia/libmms/libmms.mk @@ -13,4 +13,4 @@ LIBMMS_INSTALL_TARGET = YES LIBMMS_DEPENDENCIES = host-pkg-config libglib2 -$(eval $(call AUTOTARGETS,package/multimedia,libmms)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/libmpd/libmpd.mk b/package/multimedia/libmpd/libmpd.mk index 47a802abe..a58b537d1 100644 --- a/package/multimedia/libmpd/libmpd.mk +++ b/package/multimedia/libmpd/libmpd.mk @@ -9,4 +9,4 @@ LIBMPD_SITE = http://download.sarine.nl/download/Programs/gmpc/$(LIBMPD_VERSION) LIBMPD_INSTALL_STAGING = YES LIBMPD_DEPENDENCIES = libglib2 -$(eval $(call AUTOTARGETS,package/multimedia,libmpd)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/libmpeg2/libmpeg2.mk b/package/multimedia/libmpeg2/libmpeg2.mk index 8bcc99967..8713c8797 100644 --- a/package/multimedia/libmpeg2/libmpeg2.mk +++ b/package/multimedia/libmpeg2/libmpeg2.mk @@ -26,4 +26,4 @@ endef LIBMPEG2_POST_INSTALL_TARGET_HOOKS += LIBMPEG2_REMOVE_BINS endif -$(eval $(call AUTOTARGETS,package/multimedia,libmpeg2)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/libogg/libogg.mk b/package/multimedia/libogg/libogg.mk index 0fd6b27b3..86d5b0110 100644 --- a/package/multimedia/libogg/libogg.mk +++ b/package/multimedia/libogg/libogg.mk @@ -12,4 +12,4 @@ LIBOGG_INSTALL_TARGET = YES LIBOGG_DEPENDENCIES = host-pkg-config -$(eval $(call AUTOTARGETS,package/multimedia,libogg)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/libreplaygain/libreplaygain.mk b/package/multimedia/libreplaygain/libreplaygain.mk index cc023a090..47bf58642 100644 --- a/package/multimedia/libreplaygain/libreplaygain.mk +++ b/package/multimedia/libreplaygain/libreplaygain.mk @@ -11,4 +11,4 @@ LIBREPLAYGAIN_SOURCE = libreplaygain_$(LIBREPLAYGAIN_VERSION).tar.gz LIBREPLAYGAIN_AUTORECONF = YES LIBREPLAYGAIN_INSTALL_STAGING = YES -$(eval $(call AUTOTARGETS,package/multimedia,libreplaygain)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/libsamplerate/libsamplerate.mk b/package/multimedia/libsamplerate/libsamplerate.mk index f20026a3b..d03a5d992 100644 --- a/package/multimedia/libsamplerate/libsamplerate.mk +++ b/package/multimedia/libsamplerate/libsamplerate.mk @@ -14,4 +14,4 @@ ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) LIBSAMPLERATE_DEPENDENCIES += libsndfile endif -$(eval $(call AUTOTARGETS,package/multimedia,libsamplerate)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/libsndfile/libsndfile.mk b/package/multimedia/libsndfile/libsndfile.mk index 52ecce5ed..548061887 100644 --- a/package/multimedia/libsndfile/libsndfile.mk +++ b/package/multimedia/libsndfile/libsndfile.mk @@ -8,4 +8,4 @@ LIBSNDFILE_VERSION = 1.0.25 LIBSNDFILE_SITE = http://www.mega-nerd.com/libsndfile/files LIBSNDFILE_INSTALL_STAGING = YES -$(eval $(call AUTOTARGETS,package/multimedia,libsndfile)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/libtheora/libtheora.mk b/package/multimedia/libtheora/libtheora.mk index e572d1a20..89489b787 100644 --- a/package/multimedia/libtheora/libtheora.mk +++ b/package/multimedia/libtheora/libtheora.mk @@ -17,4 +17,4 @@ LIBTHEORA_CONF_OPT = \ LIBTHEORA_DEPENDENCIES = libogg libvorbis host-pkg-config -$(eval $(call AUTOTARGETS,package/multimedia,libtheora)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/libvorbis/libvorbis.mk b/package/multimedia/libvorbis/libvorbis.mk index 0570ea65d..dfe7bce6f 100644 --- a/package/multimedia/libvorbis/libvorbis.mk +++ b/package/multimedia/libvorbis/libvorbis.mk @@ -15,4 +15,4 @@ LIBVORBIS_CONF_OPT = --disable-oggtest LIBVORBIS_DEPENDENCIES = host-pkg-config libogg -$(eval $(call AUTOTARGETS,package/multimedia,libvorbis)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/madplay/madplay.mk b/package/multimedia/madplay/madplay.mk index a2ac14d38..9fad45f67 100644 --- a/package/multimedia/madplay/madplay.mk +++ b/package/multimedia/madplay/madplay.mk @@ -16,4 +16,4 @@ MADPLAY_CONF_OPT+=--with-alsa MADPLAY_DEPENDENCIES+=alsa-lib endif -$(eval $(call AUTOTARGETS,package/multimedia,madplay)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk index b85e077be..2a4889ab3 100644 --- a/package/multimedia/mpd/mpd.mk +++ b/package/multimedia/mpd/mpd.mk @@ -126,4 +126,4 @@ endef MPD_POST_INSTALL_TARGET_HOOKS += MPD_INSTALL_EXTRA_FILES -$(eval $(call AUTOTARGETS,package/multimedia,mpd)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk index 43f631c62..17d398e81 100644 --- a/package/multimedia/mpg123/mpg123.mk +++ b/package/multimedia/mpg123/mpg123.mk @@ -41,4 +41,4 @@ MPG123_CONF_OPT += --with-audio=alsa MPG123_DEPENDENCIES += alsa-lib endif -$(eval $(call AUTOTARGETS,package/multimedia,mpg123)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/portaudio/portaudio.mk b/package/multimedia/portaudio/portaudio.mk index f403d002a..a82473593 100644 --- a/package/multimedia/portaudio/portaudio.mk +++ b/package/multimedia/portaudio/portaudio.mk @@ -18,4 +18,4 @@ PORTAUDIO_CONF_OPT = \ $(if $(BR2_PACKAGE_PORTAUDIO_OSS),--with-oss,--without-oss) \ $(if $(BR2_PACKAGE_PORTAUDIO_CXX),--enable-cxx,--disable-cxx) -$(eval $(call AUTOTARGETS,package/multimedia,portaudio)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/speex/speex.mk b/package/multimedia/speex/speex.mk index 7de3b3830..dfb426bca 100644 --- a/package/multimedia/speex/speex.mk +++ b/package/multimedia/speex/speex.mk @@ -33,4 +33,4 @@ define SPEEX_BUILD_CMDS $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPT) -C $(@D)/$($(PKG)_SUBDIR) endef -$(eval $(call AUTOTARGETS,package/multimedia,speex)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/swfdec/swfdec.mk b/package/multimedia/swfdec/swfdec.mk index 9b4b72953..f88d7db1d 100644 --- a/package/multimedia/swfdec/swfdec.mk +++ b/package/multimedia/swfdec/swfdec.mk @@ -29,7 +29,7 @@ else SWFDEC_CONF_OPT += --disable-gtk endif -$(eval $(call AUTOTARGETS,package/multimedia,swfdec)) +$(eval $(call AUTOTARGETS)) # swfdec uses glib-* at install time # Notice: must come after AUTOTARGETS as that's where these variables gets set diff --git a/package/multimedia/tremor/tremor.mk b/package/multimedia/tremor/tremor.mk index 654a403ee..cf228b8e3 100644 --- a/package/multimedia/tremor/tremor.mk +++ b/package/multimedia/tremor/tremor.mk @@ -12,4 +12,4 @@ TREMOR_AUTORECONF = YES TREMOR_INSTALL_STAGING = YES TREMOR_INSTALL_TARGET = YES -$(eval $(call AUTOTARGETS,package/multimedia,tremor)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/vorbis-tools/vorbis-tools.mk b/package/multimedia/vorbis-tools/vorbis-tools.mk index 6fd6c2a8e..fc79b3f70 100644 --- a/package/multimedia/vorbis-tools/vorbis-tools.mk +++ b/package/multimedia/vorbis-tools/vorbis-tools.mk @@ -17,4 +17,4 @@ ifeq ($(BR2_PACKAGE_SPEEX),y) VORBIS_TOOLS_DEPENDENCIES += speex endif -$(eval $(call AUTOTARGETS,package/multimedia,vorbis-tools)) +$(eval $(call AUTOTARGETS)) diff --git a/package/multimedia/wavpack/wavpack.mk b/package/multimedia/wavpack/wavpack.mk index 035963a57..8b0af0baa 100644 --- a/package/multimedia/wavpack/wavpack.mk +++ b/package/multimedia/wavpack/wavpack.mk @@ -13,4 +13,4 @@ ifneq ($(BR2_ENABLE_LOCALE),y) WAVPACK_DEPENDENCIES += libiconv endif -$(eval $(call AUTOTARGETS,package/multimedia,wavpack)) +$(eval $(call AUTOTARGETS)) |