diff options
| author | David I. Lehn <dlehn@users.sourceforge.net> | 2002-08-09 21:14:55 +0000 |
|---|---|---|
| committer | David I. Lehn <dlehn@users.sourceforge.net> | 2002-08-09 21:14:55 +0000 |
| commit | 3b70a4e5ac74b6d7b0106b839c8380972369193d (patch) | |
| tree | 24af4065a62831367a038d6fbfeccdd47ba45fb7 /ext | |
| parent | 6c3286ec719fcd04785177712304d917afc1c52e (diff) | |
libdv build fixes
Original commit message from CVS:
libdv build fixes
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/Makefile.am | 16 | ||||
| -rw-r--r-- | ext/dv/Makefile.am | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/ext/Makefile.am b/ext/Makefile.am index 2e9f7990..46ba06d8 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -46,12 +46,6 @@ else CDPARANOIA_DIR= endif -if USE_DV -LIBDV_DIR=dv -else -LIBDV_DIR= -endif - if USE_DVDREAD DVDREAD_DIR=dvdread else @@ -136,6 +130,12 @@ else LCS_DIR= endif +if USE_LIBDV +LIBDV_DIR=dv +else +LIBDV_DIR= +endif + if USE_LIBFAME LIBFAME_DIR=libfame else @@ -228,11 +228,11 @@ endif SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \ $(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \ - $(AVIFILE_DIR) $(CDPARANOIA_DIR) $(LIBDV_DIR) \ + $(AVIFILE_DIR) $(CDPARANOIA_DIR) \ $(DVDREAD_DIR) $(DVDNAV_DIR) $(ESD_DIR) \ $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \ $(HERMES_DIR) $(HTTP_DIR) $(JACK_DIR) $(JPEG_DIR) \ - $(LADSPA_DIR) $(LAME_DIR) $(LCS_DIR) $(LIBFAME_DIR) \ + $(LADSPA_DIR) $(LAME_DIR) $(LCS_DIR) $(LIBDV_DIR) $(LIBFAME_DIR) \ $(MAD_DIR) $(MIKMOD_DIR) $(MJPEGTOOLS_DIR) $(MPEG2DEC_DIR) \ $(OPENQUICKTIME_DIR) $(RAW1394_DIR) $(RTP_DIR) \ $(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \ 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 |