summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2002-08-19 08:58:57 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2002-08-19 08:58:57 +0000
commit6a46a32e177190629904aee6d21ea88318cf874f (patch)
treea9b51eb448fc1e94f1f3c24b109bdbab5bc072c5 /src
parent0f40e3991ce3ea3f0deaac5d5991f98e7f537719 (diff)
downloadxine-lib-6a46a32e177190629904aee6d21ea88318cf874f.tar.gz
xine-lib-6a46a32e177190629904aee6d21ea88318cf874f.tar.bz2
fix for older automake versions
CVS patchset: 2478 CVS date: 2002/08/19 08:58:57
Diffstat (limited to 'src')
-rw-r--r--src/input/Makefile.am11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 25585cfc5..97b14e57d 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -29,10 +29,12 @@ if HAVE_DVDNAV
DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
$(DVDNAV_CFLAGS) \
-I$(top_srcdir)/src/input/libdvdread/
+link_dvdnav = $(DVDNAV_LIBS)
else
DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
-I$(top_srcdir)/src/input/libdvdnav/ \
-I$(top_srcdir)/src/input/libdvdread/
+link_dvdnav = libdvdnav/libdvdnav.la libdvdread/libdvdread.la
endif
CFLAGS = @CFLAGS@ $(DVD_CFLAGS)
@@ -47,15 +49,8 @@ xineplug_inp_file_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la
xineplug_inp_file_la_LDFLAGS = -avoid-version -module
xineplug_inp_dvd_la_SOURCES = input_dvd.c
-if HAVE_DVDNAV
-xineplug_inp_dvd_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la \
- libdvdread/libdvdread.la $(DVDNAV_LIBS)
-xineplug_inp_dvd_la_LDFLAGS = -avoid-version -module
-else
-xineplug_inp_dvd_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la \
- libdvdnav/libdvdnav.la libdvdread/libdvdread.la
+xineplug_inp_dvd_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la $(link_dvdnav)
xineplug_inp_dvd_la_LDFLAGS = -avoid-version -module
-endif
xineplug_inp_net_la_SOURCES = input_net.c net_buf_ctrl.c
xineplug_inp_net_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la