demux: avoid genmf

Also rename dirac to diracsys to disambiguate from the encoder.

modules/demux/.gitignore

-Makefile.am
-dummy.cpp

modules/demux/Modules.am → modules/demux/Makefile.am

-SOURCES_flacsys = flac.c xiph_metadata.h xiph_metadata.c
-SOURCES_ogg = ogg.c ogg.h oggseek.c oggseek.h xiph_metadata.h xiph.h xiph_metadata.c
-SOURCES_demuxdump = demuxdump.c
-SOURCES_rawdv = rawdv.c rawdv.h
-SOURCES_rawvid = rawvid.c
-SOURCES_au = au.c
-SOURCES_rawaud = rawaud.c
-SOURCES_wav = wav.c
-SOURCES_nsv = nsv.c
-SOURCES_real = real.c
-SOURCES_ps = ps.c ps.h
-SOURCES_mod = mod.c
-SOURCES_pva = pva.c
-SOURCES_aiff = aiff.c
-SOURCES_mjpeg = mjpeg.c mxpeg_helper.h
-SOURCES_subtitle = subtitle.c
-SOURCES_ty = ty.c ../codec/cc.h
-SOURCES_vobsub = vobsub.c vobsub.h
-SOURCES_voc = voc.c
-SOURCES_xa = xa.c
-SOURCES_nuv = nuv.c
-SOURCES_nsc = nsc.c
-SOURCES_mpc = mpc.c
-SOURCES_tta = tta.c
-SOURCES_vc1 = vc1.c
-SOURCES_demux_cdg = cdg.c
-SOURCES_smf = smf.c
-SOURCES_gme = gme.c dummy.cpp
-SOURCES_sid = sid.cpp
-SOURCES_dirac = dirac.c
-SOURCES_image = image.c mxpeg_helper.h
-SOURCES_demux_stl = stl.c
+include ../common.am
+demuxdir = $(pluginsdir)/demux
+demux_LTLIBRARIES =
+EXTRA_LTLIBRARIES =
+
+libflacsys_plugin_la_SOURCES = flac.c xiph_metadata.h xiph_metadata.c
+demux_LTLIBRARIES += libflacsys_plugin.la
+
+libogg_plugin_la_SOURCES = ogg.c ogg.h oggseek.c oggseek.h \
+	xiph_metadata.h xiph.h xiph_metadata.c
+libogg_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_ogg)
+libogg_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)'
+libogg_plugin_la_LIBADD = $(LIBS_ogg)
+EXTRA_LTLIBRARIES += libogg_plugin.la
+demux_LTLIBRARIES += $(LTLIBogg)
+
+libdemuxdump_plugin_la_SOURCES = demuxdump.c
+demux_LTLIBRARIES += libdemuxdump_plugin.la
+
+librawdv_plugin_la_SOURCES = rawdv.c rawdv.h
+demux_LTLIBRARIES += librawdv_plugin.la
+
+librawvid_plugin_la_SOURCES = rawvid.c
+demux_LTLIBRARIES += librawvid_plugin.la
+
+libau_plugin_la_SOURCES = au.c
+demux_LTLIBRARIES += libau_plugin.la
+
+librawaud_plugin_la_SOURCES = rawaud.c
+demux_LTLIBRARIES += librawaud_plugin.la
+
+libwav_plugin_la_SOURCES = wav.c
+demux_LTLIBRARIES += libwav_plugin.la
+
+libnsv_plugin_la_SOURCES = nsv.c
+demux_LTLIBRARIES += libnsv_plugin.la
+
+libreal_plugin_la_SOURCES = real.c
+demux_LTLIBRARIES += libreal_plugin.la
+
+libps_plugin_la_SOURCES = ps.c ps.h
+demux_LTLIBRARIES += libps_plugin.la
+
+libmod_plugin_la_SOURCES = mod.c
+libmod_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS_mod)
+libmod_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)'
+libmod_plugin_la_LIBADD = $(LIBS_mod)
+EXTRA_LTLIBRARIES += libmod_plugin.la
+demux_LTLIBRARIES += $(LTLIBmod)
+
+libpva_plugin_la_SOURCES = pva.c
+demux_LTLIBRARIES += libpva_plugin.la
+
+libaiff_plugin_la_SOURCES = aiff.c
+demux_LTLIBRARIES += libaiff_plugin.la
+
+libmjpeg_plugin_la_SOURCES = mjpeg.c mxpeg_helper.h
+demux_LTLIBRARIES += libmjpeg_plugin.la
+
+libsubtitle_plugin_la_SOURCES = subtitle.c
+demux_LTLIBRARIES += libsubtitle_plugin.la
+
+libty_plugin_la_SOURCES = ty.c ../codec/cc.h
+demux_LTLIBRARIES += libty_plugin.la
+
+libvobsub_plugin_la_SOURCES = vobsub.c vobsub.h
+demux_LTLIBRARIES += libvobsub_plugin.la
+
+libvoc_plugin_la_SOURCES = voc.c
+demux_LTLIBRARIES += libvoc_plugin.la
+
+libxa_plugin_la_SOURCES = xa.c
+demux_LTLIBRARIES += libxa_plugin.la
+
+libnuv_plugin_la_SOURCES = nuv.c
+demux_LTLIBRARIES += libnuv_plugin.la
+
+libnsc_plugin_la_SOURCES = nsc.c
+demux_LTLIBRARIES += libnsc_plugin.la
+
+libmpc_plugin_la_SOURCES = mpc.c
+libmpc_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)'
+libmpc_plugin_la_LIBADD = $(LIBS_mpc)
+EXTRA_LTLIBRARIES += libmpc_plugin.la
+demux_LTLIBRARIES += $(LTLIBmpc)
+
+libtta_plugin_la_SOURCES = tta.c
+libtta_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)'
+demux_LTLIBRARIES += libtta_plugin.la
+
+libvc1_plugin_la_SOURCES = vc1.c
+libvc1_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)'
+demux_LTLIBRARIES += libvc1_plugin.la
+
+libdemux_cdg_plugin_la_SOURCES = cdg.c
+libdemux_cdg_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)'
+demux_LTLIBRARIES += libdemux_cdg_plugin.la
+
+libsmf_plugin_la_SOURCES = smf.c
+libsmf_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)'
+demux_LTLIBRARIES += libsmf_plugin.la
+
+libgme_plugin_la_SOURCES = gme.c dummy.cpp
+libgme_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)'
+libgme_plugin_la_LIBADD = $(LIBS_gme)
+EXTRA_LTLIBRARIES += libgme_plugin.la
+demux_LTLIBRARIES += $(LTLIBgme)
+
+libsid_plugin_la_SOURCES = sid.cpp
+libsid_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_sid)
+libsid_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)'
+libsid_plugin_la_LIBADD = $(LIBS_sid)
+EXTRA_LTLIBRARIES += libsid_plugin.la
+demux_LTLIBRARIES += $(LTLIBsid)
+
+libdiracsys_plugin_la_SOURCES = dirac.c
+demux_LTLIBRARIES += libdiracsys_plugin.la
+
+libimage_plugin_la_SOURCES = image.c mxpeg_helper.h
+demux_LTLIBRARIES += libimage_plugin.la
+
+libdemux_stl_plugin_la_SOURCES = stl.c
+demux_LTLIBRARIES += libdemux_stl_plugin.la
 
 libasf_plugin_la_SOURCES = asf/asf.c asf/libasf.c asf/libasf.h asf/libasf_guid.h
+demux_LTLIBRARIES += libasf_plugin.la
 
 libavi_plugin_la_SOURCES = avi/avi.c avi/libavi.c avi/libavi.h
+demux_LTLIBRARIES += libavi_plugin.la
 
 libavformat_plugin_la_SOURCES = avformat/demux.c \
 	../codec/avcodec/fourcc.c \
@@ -64,11 +157,10 @@ endif
 
 libes_plugin_la_SOURCES  = mpeg/es.c
 libes_plugin_la_LIBADD = ../libvlc_dts_header.la
-if HAVE_WIN32
-libes_plugin_la_DEPENDENCIES = libes_plugin.rc.o
-endif
+demux_LTLIBRARIES += libes_plugin.la
 
 libh264_plugin_la_SOURCES = mpeg/h264.c
+demux_LTLIBRARIES += libh264_plugin.la
 
 libmkv_plugin_la_SOURCES = \
 	mkv/util.hpp mkv/util.cpp \
@@ -97,11 +189,10 @@ libmp4_plugin_la_LDFLAGS = $(AM_LDFLAGS)
 if HAVE_ZLIB
 libmp4_plugin_la_LIBADD += -lz
 endif
-if HAVE_WIN32
-libmp4_plugin_la_DEPENDENCIES = libmp4_plugin.rc.o
-endif
+demux_LTLIBRARIES += libmp4_plugin.la
 
 libmpgv_plugin_la_SOURCES = mpeg/mpgv.c
+demux_LTLIBRARIES += libmpgv_plugin.la
 
 libplaylist_plugin_la_SOURCES = \
 	playlist/asx.c \
@@ -122,6 +213,7 @@ libplaylist_plugin_la_SOURCES = \
 	playlist/xspf.c \
 	playlist/zpl.c \
 	playlist/playlist.c playlist/playlist.h
+demux_LTLIBRARIES += libplaylist_plugin.la
 
 libts_plugin_la_SOURCES = ts.c ../mux/mpeg/csa.c ../mux/mpeg/dvbpsi_compat.h dvb-text.h
 libts_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVBPSI_CFLAGS)
@@ -133,43 +225,6 @@ if HAVE_DVBPSI
 demux_LTLIBRARIES += libts_plugin.la
 endif
 
-demux_LTLIBRARIES += \
-	libaiff_plugin.la \
-	libasf_plugin.la \
-	libau_plugin.la \
-	libavi_plugin.la \
-	librawaud_plugin.la \
-	libdirac_plugin.la \
-	libdemux_cdg_plugin.la \
-	libdemuxdump_plugin.la \
-	libes_plugin.la \
-	libflacsys_plugin.la \
-	libh264_plugin.la \
-	libmjpeg_plugin.la \
-	libmp4_plugin.la \
-	libmpgv_plugin.la \
-	libnsc_plugin.la \
-	libnsv_plugin.la \
-	libnuv_plugin.la \
-	libplaylist_plugin.la \
-	libpva_plugin.la \
-	libps_plugin.la \
-	librawdv_plugin.la \
-	librawvid_plugin.la \
-	libreal_plugin.la \
-	libsmf_plugin.la \
-	libsubtitle_plugin.la \
-	libtta_plugin.la \
-	libty_plugin.la \
-	libvc1_plugin.la \
-	libvobsub_plugin.la \
-	libvoc_plugin.la \
-	libwav_plugin.la \
-	libxa_plugin.la \
-	libimage_plugin.la \
-	libdemux_stl_plugin.la \
-	$(NULL)
-
 BUILT_SOURCES += dummy.cpp
 
 dummy.cpp:

modules/demux/dirac.c

@@ -56,6 +56,7 @@ vlc_module_begin();
     add_integer( DEMUX_CFG_PREFIX DEMUX_DTSOFFSET, 0,
                  DEMUX_DTSOFFSET_TEXT, DEMUX_DTSOFFSET_LONGTEXT, false )
     set_callbacks( Open, Close );
+    add_shortcut( "dirac" )
 vlc_module_end();
 
 /*****************************************************************************