1 files changed, 29 insertions, 10 deletions
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index 46e5bc8b6..e7a64cd6d 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -1,17 +1,36 @@
-CFLAGS = @BUILD_LIB_STATIC@ @GLOBAL_CFLAGS@
+CFLAGS = @GLOBAL_CFLAGS@
 
-noinst_LTLIBRARIES = libdemux.la
+LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
-#libdemux_la_SOURCES = demux_avi.c demux_mpeg_block.c demux_mpeg.c \
-#	demux_mpgaudio.c demux_elem.c
-libdemux_la_SOURCES = demux_avi.c demux_mpeg_block.c demux_mpeg.c
-#libdemux_la_DEPENDENCIES = libsdeps
-#libdemux_la_LIBADD = $(top_builddir)/libmpg123/libmpg123.la
+libdir = $(XINE_PLUGINDIR)
 
-include_HEADERS = demux.h
+##
+# IMPORTANT:
+# ---------
+# All of xine demuxer plugins should be named like the scheme "xineplug_dmx_"
+#
+#lib_LTLIBRARIES = xineplug_dmx_avi.la xineplug_dmx_mpeg_block.la \
+#	xineplug_dmx_mpeg.la xineplug_dmx_mpeg_audio.la \
+#	xineplug_dmx_mpeg_elem.la
+lib_LTLIBRARIES = xineplug_dmx_avi.la xineplug_dmx_mpeg_block.la \
+	xineplug_dmx_mpeg.la
+
+xineplug_dmx_avi_la_SOURCES = demux_avi.c
+xineplug_dmx_avi_la_LDFLAGS = -avoid-version -module
+
+xineplug_dmx_mpeg_block_la_SOURCES = demux_mpeg_block.c
+xineplug_dmx_mpeg_block_la_LDFLAGS = -avoid-version -module
 
-#libsdeps:
-#	@cd $(top_builddir)/libmpg123 && $(MAKE) libmpg123.la
+xineplug_dmx_mpeg_la_SOURCES = demux_mpeg.c
+xineplug_dmx_mpeg_la_LDFLAGS = -avoid-version -module
+
+#xineplug_dmx_mpeg_audio_la_SOURCES = demux_mpgaudio.c
+#xineplug_dmx_mpeg_audio_la_LDFLAGS = -avoid-version -module
+
+#xineplug_dmx_mpeg_elem_la_SOURCES = demux_elem.c
+#xineplug_dmx_mpeg_elem_la_LDFLAGS = -avoid-version -module
+
+include_HEADERS = demux.h
 
 ##
 ## Install header files (default=$includedir/xine)