diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-05-15 08:21:15 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-05-15 08:21:15 +0000 |
| commit | 6d3eb02b8b26a519967debe0c4b363c796735cb1 (patch) | |
| tree | e433ecfdebc0f72340ebc87d53a19a31c42cf08a | |
| parent | 351aa71bc8ec38736b4e79c9ab8242b242176874 (diff) | |
| download | xine-lib-6d3eb02b8b26a519967debe0c4b363c796735cb1.tar.gz xine-lib-6d3eb02b8b26a519967debe0c4b363c796735cb1.tar.bz2 | |
some build-system cleanup
CVS patchset: 4848
CVS date: 2003/05/15 08:21:15
| -rw-r--r-- | src/audio_out/Makefile.am | 2 | ||||
| -rw-r--r-- | src/liba52/Makefile.am | 1 | ||||
| -rw-r--r-- | src/libsputext/Makefile.am | 6 | ||||
| -rw-r--r-- | src/libw32dll/wine/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libxineadec/Makefile.am | 1 |
5 files changed, 7 insertions, 5 deletions
diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am index e535ef6ee..1298b7c5c 100644 --- a/src/audio_out/Makefile.am +++ b/src/audio_out/Makefile.am @@ -59,7 +59,7 @@ xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c xineplug_ao_out_oss_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c -xineplug_ao_out_alsa_la_LIBADD = $(ALSA_LIBS) +xineplug_ao_out_alsa_la_LIBADD = $(ALSA_LIBS) $(XINE_LIB) xineplug_ao_out_alsa_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_ao_out_esd_la_SOURCES = audio_esd_out.c diff --git a/src/liba52/Makefile.am b/src/liba52/Makefile.am index 45349b507..ec6dfd642 100644 --- a/src/liba52/Makefile.am +++ b/src/liba52/Makefile.am @@ -1,7 +1,6 @@ include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(LIBA52_CFLAGS) -DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(LIBA52_CFLAGS) libdir = $(XINE_PLUGINDIR) diff --git a/src/libsputext/Makefile.am b/src/libsputext/Makefile.am index ca5af05e0..5dd12bbf3 100644 --- a/src/libsputext/Makefile.am +++ b/src/libsputext/Makefile.am @@ -10,13 +10,13 @@ lib_LTLIBRARIES = $(sputext_decoder) xineplug_dmx_sputext_la_SOURCES = demux_sputext.c ## libgiconv is only needed with FreeBSD -xineplug_dmx_sputext_la_LIBADD = $(XINELIB) $(GICONV_BSD_LIBS) +xineplug_dmx_sputext_la_LIBADD = $(XINE_LIB) $(GICONV_BSD_LIBS) xineplug_dmx_sputext_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_decode_sputext_la_SOURCES = xine_decoder.c -xineplug_decode_sputext_la_LIBADD = $(XINELIB) +xineplug_decode_sputext_la_LIBADD = $(XINE_LIB) xineplug_decode_sputext_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_decode_spuogm_la_SOURCES = xine_decoder_ogm.c -xineplug_decode_spuogm_la_LIBADD = $(XINELIB) +xineplug_decode_spuogm_la_LIBADD = $(XINE_LIB) xineplug_decode_spuogm_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am index 2e9893207..41005bb40 100644 --- a/src/libw32dll/wine/Makefile.am +++ b/src/libw32dll/wine/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/misc/Makefile.common +LIBTOOL = $(SHELL) $(top_builddir)/libtool + EXTRA_DIST = stubs.s wrapper.S noinst_LTLIBRARIES = $(wine_lib) diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am index 6451cc3b7..f25dfe29d 100644 --- a/src/libxineadec/Makefile.am +++ b/src/libxineadec/Makefile.am @@ -18,6 +18,7 @@ lib_LTLIBRARIES = \ xineplug_decode_28k8.la xineplug_decode_roqaudio_la_SOURCES = roqaudio.c +xineplug_decode_roqaudio_la_LIBADD = $(XINE_LIB) xineplug_decode_roqaudio_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_decode_adpcm_la_SOURCES = adpcm.c |