diff options
| -rw-r--r-- | src/input/Makefile.am | 11 | ||||
| -rw-r--r-- | src/libspeex/Makefile.am | 23 |
2 files changed, 5 insertions, 29 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 diff --git a/src/libspeex/Makefile.am b/src/libspeex/Makefile.am index 627f14f65..ae10631a9 100644 --- a/src/libspeex/Makefile.am +++ b/src/libspeex/Makefile.am @@ -1,11 +1,7 @@ -## -## Process this file with automake to produce Makefile.in -## +include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(SPEEX_CFLAGS) -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic - libdir = $(XINE_PLUGINDIR) if HAVE_SPEEX @@ -15,20 +11,5 @@ endif lib_LTLIBRARIES = $(speex_module) xineplug_decode_speex_la_SOURCES = xine_decoder.c -xineplug_decode_speex_la_LIBADD = $(SPEEX_LIBS) +xineplug_decode_speex_la_LIBADD = $(SPEEX_LIBS) $(XINE_LIB) xineplug_decode_speex_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - -debug: -# @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(OGG_CFLAGS) $(SPEEX_CFLAGS)" - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in |