summaryrefslogtreecommitdiffstats
path: root/ext/Makefile.am
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2002-11-26 14:51:33 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2002-11-26 14:51:33 +0000
commitab5a4110e2d379f4c1cf3bc71292b3c361cb27d6 (patch)
treefaed005591193dff13ce4af47ab7b8a1a16832ea /ext/Makefile.am
parent999fda13e6e5c6bfc54895e08fc891febf85a9ce (diff)
downloadgst-plugins-bad-ab5a4110e2d379f4c1cf3bc71292b3c361cb27d6.tar.gz
gst-plugins-bad-ab5a4110e2d379f4c1cf3bc71292b3c361cb27d6.tar.bz2
gst-plugins-bad-ab5a4110e2d379f4c1cf3bc71292b3c361cb27d6.zip
flac debug cleanup m4 for ffmpeg
Original commit message from CVS: flac debug cleanup m4 for ffmpeg
Diffstat (limited to 'ext/Makefile.am')
-rw-r--r--ext/Makefile.am14
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 763c6776..c2a973f3 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -76,6 +76,12 @@ else
GSM_DIR=
endif
+if USE_FFMPEG
+FFMPEG_DIR=ffmpeg
+else
+FFMPEG_DIR=
+endif
+
if USE_FLAC
FLAC_DIR=flac
else
@@ -142,12 +148,6 @@ else
LIBFAME_DIR=
endif
-if USE_LIBPNG
-LIBPNG_DIR=libpng
-else
-LIBPNG_DIR=
-endif
-
if USE_MAD
MAD_DIR=mad
else
@@ -242,7 +242,7 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
$(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \
$(AVIFILE_DIR) $(CDPARANOIA_DIR) \
$(DVDREAD_DIR) $(DVDNAV_DIR) $(ESD_DIR) \
- $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \
+ $(FFMPEG_DIR) $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \
$(HERMES_DIR) $(HTTP_DIR) $(JACK_DIR) $(JPEG_DIR) \
$(LADSPA_DIR) $(LAME_DIR) $(LCS_DIR) $(LIBDV_DIR) $(LIBFAME_DIR) \
$(MAD_DIR) $(MIKMOD_DIR) $(MJPEGTOOLS_DIR) $(MPEG2DEC_DIR) \