summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2003-06-18 12:52:19 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2003-06-18 12:52:19 +0000
commitd96ed959351fb17f515e82405dec199e40dc581c (patch)
tree356e27c1fa5e06fdb055128145694374184b94f0 /src/input
parent3df319e1aefae857e22be20831fa9c91c71b11eb (diff)
downloadxine-lib-d96ed959351fb17f515e82405dec199e40dc581c.tar.gz
xine-lib-d96ed959351fb17f515e82405dec199e40dc581c.tar.bz2
small Makefile cleanup
CVS patchset: 5063 CVS date: 2003/06/18 12:52:19
Diffstat (limited to 'src/input')
-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 8754d7726..fa7afdab7 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -31,10 +31,6 @@ if HAVE_GNOME_VFS
in_gnome_vfs = xineplug_inp_gnome_vfs.la
endif
-if HAVE_ALSA
-v4l_ldflags = -lasound
-endif
-
# For DVD
if HAVE_DVDNAV
DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE $(DVDNAV_CFLAGS)
@@ -45,8 +41,7 @@ DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
link_dvdnav = libdvdnav/libdvdnav.la
endif
-AM_CFLAGS = $(GNOME_VFS_CFLAGS) $(DVD_CFLAGS) @ANSI_FLAGS@
-DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(DVD_CFLAGS) @ANSI_FLAGS@
+AM_CFLAGS = $(GNOME_VFS_CFLAGS) $(DVD_CFLAGS) $(ALSA_CFLAGS) @ANSI_FLAGS@
lib_LTLIBRARIES = \
xineplug_inp_file.la \
@@ -128,14 +123,14 @@ xineplug_inp_cdda_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_inp_v4l_la_SOURCES = input_v4l.c
xineplug_inp_v4l_la_LIBADD = $(XINE_LIB)
-xineplug_inp_v4l_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ $(v4l_ldflags)
+xineplug_inp_v4l_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_inp_gnome_vfs_la_SOURCES = input_gnome_vfs.c
xineplug_inp_gnome_vfs_la_LIBADD = $(GNOME_VFS_LIBS) $(XINE_LIB)
xineplug_inp_gnome_vfs_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_inp_pvr_la_SOURCES = input_pvr.c
-xineplug_inp_pvr_la_LIBADD = $(XINE_LIB)
+xineplug_inp_pvr_la_LIBADD = $(ALSA_LIBS) $(XINE_LIB)
xineplug_inp_pvr_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
include_HEADERS = input_plugin.h