summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authorDavid I. Lehn <dlehn@users.sourceforge.net>2002-07-05 10:17:09 +0000
committerDavid I. Lehn <dlehn@users.sourceforge.net>2002-07-05 10:17:09 +0000
commitaaeb23ccc86aee72363b5dafe382375a3d1a0431 (patch)
tree1006495476f22ba8ef734fd4435052da97d117de /ext
parentfbb485606a888957f277c00dc92280b245bdb5cb (diff)
attempt to fix my sucky dv and festival breakage.
Original commit message from CVS: attempt to fix my sucky dv and festival breakage.
Diffstat (limited to 'ext')
-rw-r--r--ext/Makefile.am12
-rw-r--r--ext/dv/Makefile.am4
2 files changed, 8 insertions, 8 deletions
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 32f9741e..d22c65fd 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -46,10 +46,10 @@ else
CDPARANOIA_DIR=
endif
-if USE_DV
-DV_DIR=dv
+if USE_LIBDV
+LIBDV_DIR=dv
else
-DV_DIR=
+LIBDV_DIR=
endif
if USE_DVDREAD
@@ -228,9 +228,9 @@ endif
SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
$(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \
- $(AVIFILE_DIR) $(CDPARANOIA_DIR) $(DV_DIR) \
+ $(AVIFILE_DIR) $(CDPARANOIA_DIR) $(LIBDV_DIR) \
$(DVDREAD_DIR) $(DVDNAV_DIR) $(ESD_DIR) \
- $(FESTIVAL_DIR) $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \
+ $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \
$(HERMES_DIR) $(HTTP_DIR) $(JACK_DIR) $(JPEG_DIR) \
$(LADSPA_DIR) $(LAME_DIR) $(LCS_DIR) $(LIBFAME_DIR) \
$(MAD_DIR) $(MIKMOD_DIR) $(MJPEGTOOLS_DIR) $(MPEG2DEC_DIR) \
@@ -242,7 +242,7 @@ DIST_SUBDIRS=\
a52dec aalib alsa \
arts artsd avifile \
audiofile cdparanoia dv \
- dvdread dvdnav esd festival ffmpeg \
+ dvdread dvdnav esd ffmpeg \
flac gnomevfs gsm \
hermes http jack jpeg \
ladspa lame lcs libfame \
diff --git a/ext/dv/Makefile.am b/ext/dv/Makefile.am
index f2e66937..e93141cb 100644
--- a/ext/dv/Makefile.am
+++ b/ext/dv/Makefile.am
@@ -3,8 +3,8 @@ plugindir = $(libdir)/gst
plugin_LTLIBRARIES = libgstdvdec.la
libgstdvdec_la_SOURCES = gstdvdec.c
-libgstdvdec_la_CFLAGS = $(GST_CFLAGS) $(DV_CFLAGS)
-libgstdvdec_la_LIBADD = $(DV_LIBS)
+libgstdvdec_la_CFLAGS = $(GST_CFLAGS) $(LIBDV_CFLAGS)
+libgstdvdec_la_LIBADD = $(LIBDV_LIBS)
libgstdvdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstdvdec.h