summaryrefslogtreecommitdiffstats
path: root/ext/Makefile.am
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2002-01-17 14:17:54 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2002-01-17 14:17:54 +0000
commite556383e4d33be471888f67215475b76057b34e4 (patch)
tree395dae59212bd92f06368bc5b2c1493dcf18e738 /ext/Makefile.am
parentd2d85ef45ebce1cf36dc42f091db524dfb52ee53 (diff)
mjpegtools dir
Original commit message from CVS: mjpegtools dir
Diffstat (limited to 'ext/Makefile.am')
-rw-r--r--ext/Makefile.am20
1 files changed, 10 insertions, 10 deletions
diff --git a/ext/Makefile.am b/ext/Makefile.am
index c163c99c..9481e87a 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -106,12 +106,6 @@ else
JPEG_DIR=
endif
-if USE_MJPEGTOOLS
-JPEG_MMX_DIR=jpeg-mmx
-else
-JPEG_MMX_DIR=
-endif
-
LADSPA_DIR=ladspa
if USE_LAME
@@ -132,6 +126,12 @@ else
MIKMOD_DIR=
endif
+if USE_MJPEGTOOLS
+MJPEGTOOLS_DIR=mjpegtools
+else
+MJPEGTOOLS_DIR=
+endif
+
if USE_MPEG2DEC
MPEG2DEC_DIR=mpeg2dec
else
@@ -198,8 +198,8 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
$(DVDREAD_DIR) $(ESD_DIR) $(FESTIVAL_DIR) \
$(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \
$(HERMES_DIR) $(HTTP_DIR) $(JPEG_DIR) \
- $(JPEG_MMX_DIR) $(LADSPA_DIR) $(LAME_DIR) \
- $(MAD_DIR) $(MIKMOD_DIR) $(MPEG2DEC_DIR) \
+ $(LADSPA_DIR) $(LAME_DIR) \
+ $(MAD_DIR) $(MIKMOD_DIR) $(MJPEGTOOLS_DIR) $(MPEG2DEC_DIR) \
$(OPENQUICKTIME_DIR) $(RAW1394_DIR) $(RTP_DIR) \
$(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \
$(SMOOTHWAVE_DIR) $(VORBIS_DIR) $(XMMS_DIR)
@@ -211,8 +211,8 @@ DIST_SUBDIRS=\
dvdread esd festival \
flac gnomevfs gsm \
hermes http jpeg \
- jpeg-mmx ladspa lame \
- mad mikmod mpeg2dec \
+ ladspa lame \
+ mad mikmod mjpegtools mpeg2dec \
openquicktime raw1394 rtp \
sdl shout sidplay \
smoothwave vorbis xmms