access: avoid genmf and clean up

configure.ac

@@ -106,7 +106,6 @@ case "${host_os}" in
   bsdi*)
     SYS=bsdi
     CFLAGS="${CFLAGS} -pthread"
-    VLC_ADD_LIBS([vcd cdda vcdx],[-ldvd])
     ;;
   freebsd*)
     SYS=freebsd
@@ -233,7 +232,6 @@ case "${host_os}" in
         VLC_ADD_LIBS([libvlccore],[-lwinmm])
         VLC_ADD_LDFLAGS([vlc],[-mwindows])
         VLC_ADD_LIBS([win32text],[-lgdi32])
-        VLC_ADD_LIBS([vcdx],[-lwinmm])
         AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
         ac_default_prefix="`pwd`/_win32"
         DESTDIR="`pwd`/_win32/"
@@ -606,7 +604,7 @@ AC_CHECK_FUNCS([if_nameindex if_nametoindex])
 VLC_RESTORE_FLAGS
 
 AS_IF([test -n "$SOCKET_LIBS"], [
-  VLC_ADD_LIBS([access_http access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout sap stream_out_standard stream_out_rtp stream_out_raop vod_rtsp rtp oldrc netsync gnutls ts audioscrobbler lua remoteosd zvbi audiobargraph_a],[${SOCKET_LIBS}])
+  VLC_ADD_LIBS([access_rtmp access_output_udp access_output_shout sap stream_out_standard stream_out_rtp stream_out_raop vod_rtsp rtp oldrc netsync gnutls ts audioscrobbler lua remoteosd zvbi audiobargraph_a],[${SOCKET_LIBS}])
 ])
 AC_SUBST(SOCKET_LIBS)
 
@@ -655,7 +653,7 @@ AC_CHECK_FUNC(getopt_long,, [
 AC_SUBST(GNUGETOPT_LIBS)
 
 AC_CHECK_LIB(m,cos,[
-  VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom rotate noise grain scene kate lua chorus_flanger freetype swscale postproc faad twolame equalizer spatializer param_eq samplerate freetype mpc dmo quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a audiobargraph_v speex opus mono colorthres extract ball access_imem hotkeys mosaic gaussianblur x262 x26410b hqdn3d anaglyph oldrc ncurses oldmovie glspectrum],[-lm])
+  VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom rotate noise grain scene kate lua chorus_flanger freetype swscale postproc faad twolame equalizer spatializer param_eq samplerate freetype mpc dmo quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a audiobargraph_v speex opus mono colorthres extract ball hotkeys mosaic gaussianblur x262 x26410b hqdn3d anaglyph oldrc ncurses oldmovie glspectrum],[-lm])
   LIBM="-lm"
 ], [
   LIBM=""
@@ -778,7 +776,7 @@ AC_CHECK_HEADERS(zlib.h, [ have_zlib=yes ], [ have_zlib=no ])
 AM_CONDITIONAL(HAVE_ZLIB, [ test "${have_zlib}" = "yes" ])
 if test "${have_zlib}" = "yes"
 then
-  VLC_ADD_LIBS([access_http skins2 sap unzip zip],[-lz])
+  VLC_ADD_LIBS([skins2 sap unzip zip],[-lz])
   PKG_CHECK_MODULES([MINIZIP], [minizip] , [ have_minizip=yes ], [
     AC_CHECK_HEADERS([unzip.h], [
       have_minizip=yes
@@ -1707,15 +1705,14 @@ dnl
 AC_ARG_ENABLE(linsys,
   [AS_HELP_STRING([--enable-linsys],
     [Linux Linear Systems Ltd. SDI and HD-SDI input cards (default enabled)])])
-if test "$SYS" = "linux" -a "${enable_linsys}" != "no"; then
+AS_IF([test "$SYS" = "linux" -a "${enable_linsys}" != "no"], [
   VLC_ADD_PLUGIN([linsys_hdsdi])
-  PKG_CHECK_MODULES(LINSYS_SDI, [zvbi-0.2 >= 0.2.28],
-    [ VLC_ADD_LIBS([linsys_sdi],[$LINSYS_SDI_LIBS])
-      VLC_ADD_CFLAGS([linsys_sdi],[$LINSYS_SDI_CFLAGS])
-      VLC_ADD_PLUGIN([linsys_sdi]) ],
-    [AC_MSG_WARN([${LINSYS_SDI_PKG_ERRORS}.])]
-  )
-fi
+  PKG_CHECK_MODULES(LINSYS_SDI, [zvbi-0.2 >= 0.2.28], [
+    VLC_ADD_PLUGIN([linsys_sdi])
+  ], [
+    AC_MSG_WARN([${LINSYS_SDI_PKG_ERRORS}.])
+  ])
+])
 
 dnl
 dnl dvdread module: check for libdvdread
@@ -1728,12 +1725,9 @@ dnl
 AC_ARG_ENABLE(dvdnav,
   [AS_HELP_STRING([--disable-dvdnav],
     [disable DVD navigation with libdvdnav (default auto)])])
-if test "${enable_dvdnav}" != "no"
-then
+AS_IF([test "${enable_dvdnav}" != "no"], [
   PKG_CHECK_MODULES(DVDNAV, dvdnav, [
     VLC_ADD_PLUGIN([dvdnav])
-    VLC_ADD_CFLAGS([dvdnav],[${DVDNAV_CFLAGS}])
-    VLC_ADD_LIBS([dvdnav],[${DVDNAV_LIBS}])
     AC_CHECK_LIB(dvdnav, dvdnav_get_video_resolution,
       AC_DEFINE(HAVE_DVDNAV_GET_VIDEO_RESOLUTION, 1, [Define if you have dvdnav_get_video_resolution.]),
         [], [${LIBS_dvdnav}])
@@ -1741,7 +1735,7 @@ then
       AC_DEFINE(HAVE_DVDNAV_DESCRIBE_TITLE_CHAPTERS, 1, [Define if you have dvdnav_describe_title_chapters.]),
         [], [${LIBS_dvdnav}])],
       [AC_MSG_WARN([${DVDNAV_PKG_ERRORS}.])])
-fi
+])
 
 dnl
 dnl  Blu-ray Disc Support with libbluray
@@ -1757,7 +1751,7 @@ PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv > 2.0]
 dnl
 dnl  libsmbclient plugin
 dnl
-PKG_ENABLE_MODULES_VLC([SMBCLIENT], [access_smb], [smbclient], (SMB/CIFS support), [auto])
+PKG_ENABLE_MODULES_VLC([SMBCLIENT], [smb], [smbclient], (SMB/CIFS support), [auto])
 AS_IF([test "${SYS}" = "mingw32"], [ VLC_ADD_PLUGIN([access_smb]) ])
 
 
@@ -1812,7 +1806,7 @@ AM_CONDITIONAL(HAVE_DECKLINK, [ test "${have_decklink}" != "no" ])
 dnl
 dnl  gnomeVFS access module
 dnl
-PKG_ENABLE_MODULES_VLC([GNOMEVFS], [access_gnomevfs], [gnome-vfs-2.0], [GnomeVFS access module], [auto])
+PKG_ENABLE_MODULES_VLC([GNOMEVFS], [gnomevfs], [gnome-vfs-2.0], [GnomeVFS access module], [auto])
 
 dnl
 dnl  VCDX modules
@@ -1867,7 +1861,6 @@ then
   then
     VLC_ADD_PLUGIN([vcd cdda])
     VLC_ADD_LIBS([vcd vcdx cdda],[-Wl,-framework,IOKit,-framework,CoreFoundation])
-    VLC_ADD_LIBS([vcdx cdda],[-liconv])
   fi
 
   if test "$enable_libcddb" != "no"; then
@@ -1919,11 +1912,11 @@ AM_CONDITIONAL(HAVE_MAC_SCREEN, [test "${SYS}" = "darwin" -a "x${enable_screen}"
 dnl
 dnl  VNC/RFB access module
 dnl
-PKG_ENABLE_MODULES_VLC([LIBVNC], [libvnc], [libvncclient >= 0.9.9], (VNC/rfb client support), [auto])
+PKG_ENABLE_MODULES_VLC([VNC], [vnc], [libvncclient >= 0.9.9], (VNC/rfb client support), [auto])
 
 dnl  RDP/Remote Desktop access module
 dnl
-PKG_ENABLE_MODULES_VLC([LIBFREERDP], [rdp], [freerdp >= 1.0.1], (RDP/Remote Desktop client support) )
+PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp >= 1.0.1], (RDP/Remote Desktop client support) )
 
 dnl
 dnl  Real RTSP plugin
@@ -1941,7 +1934,6 @@ AC_ARG_ENABLE(macosx-eyetv,
 if test "x${enable_macosx_eyetv}" != "xno" &&
   (test "${SYS}" = "darwin" || test "${enable_macosx_eyetv}" = "yes")
 then
-  VLC_ADD_LIBS([access_eyetv], [-Wl,-framework,Foundation])
   VLC_ADD_PLUGIN([access_eyetv])
 fi
 

modules/access/.gitignore

-Makefile.am

modules/access/Modules.am → modules/access/Makefile.am

 SUBDIRS = rtp
 noinst_LTLIBRARIES =
+libvlc_LTLIBRARIES =
+EXTRA_LTLIBRARIES =
 
-libfilesystem_plugin_la_SOURCES = \
-	fs.h \
-	file.c \
-	directory.c \
-	fs.c
-libfilesystem_plugin_la_CFLAGS = $(AM_CFLAGS)
+basedir = access
+include ../common.am
+
+### Files ###
+
+libattachment_plugin_la_SOURCES = attachment.c
+libattachment_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libvlc_LTLIBRARIES += libattachment_plugin.la
+
+libfilesystem_plugin_la_SOURCES = fs.h file.c directory.c fs.c
+libfilesystem_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 libfilesystem_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_WIN32
 libfilesystem_plugin_la_LIBADD += -lshlwapi
-libfilesystem_plugin_la_DEPENDENCIES = libfilesystem_plugin.rc.o
 endif
+libvlc_LTLIBRARIES += libfilesystem_plugin.la
 
 libidummy_plugin_la_SOURCES = idummy.c
 libidummy_plugin_la_CFLAGS = $(AM_CFLAGS)
-libidummy_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libidummy_plugin_la_DEPENDENCIES = libidummy_plugin.rc.o
-endif
+libvlc_LTLIBRARIES += libidummy_plugin.la
+
+libimem_plugin_la_SOURCES = imem.c
+libimem_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libimem_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
+libvlc_LTLIBRARIES += libimem_plugin.la
+
+librar_plugin_la_SOURCES = rar/rar.c rar/rar.h \
+	rar/access.c rar/stream.c rar/module.c
+librar_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libvlc_LTLIBRARIES += librar_plugin.la
 
 libsdp_plugin_la_SOURCES = sdp.c
 libsdp_plugin_la_CFLAGS = $(AM_CFLAGS)
-libsdp_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libsdp_plugin_la_DEPENDENCIES = libsdp_plugin.rc.o
-endif
+libvlc_LTLIBRARIES += libsdp_plugin.la
 
 libtimecode_plugin_la_SOURCES = timecode.c
 libtimecode_plugin_la_CFLAGS = $(AM_CFLAGS)
-libtimecode_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libtimecode_plugin_la_DEPENDENCIES = libtimecode_plugin.rc.o
-endif
+libvlc_LTLIBRARIES += libtimecode_plugin.la
+
+libvdr_plugin_la_SOURCES = vdr.c
+libvdr_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libvlc_LTLIBRARIES += libvdr_plugin.la
 
 libzip_plugin_la_SOURCES = zip/zip.h zip/zipstream.c zip/zipaccess.c
 libzip_plugin_la_CFLAGS = $(AM_CFLAGS) $(MINIZIP_CFLAGS)
 libzip_plugin_la_LIBADD = $(AM_LIBADD) $(MINIZIP_LIBS)
-libzip_plugin_la_DEPENDENCIES = 
-if HAVE_ZLIB
-libvlc_LTLIBRARIES += libzip_plugin.la
-if !HAVE_MINIZIP
 libunzip_la_SOURCES = zip/unzip/unzip.c zip/unzip/unzip.h zip/unzip/crypt.h \
 	zip/unzip/ioapi.c zip/unzip/ioapi.h
 libunzip_la_LIBADD = -lz
 libunzip_la_LDFLAGS = -static
+if HAVE_ZLIB
+libvlc_LTLIBRARIES += libzip_plugin.la
+if !HAVE_MINIZIP
 noinst_LTLIBRARIES += libunzip.la
 libzip_plugin_la_CFLAGS += -I$(srcdir)/zip/unzip
 libzip_plugin_la_LIBADD += libunzip.la
-libzip_plugin_la_DEPENDENCIES += libunzip.la
-endif
-if HAVE_WIN32
-libzip_plugin_la_DEPENDENCIES += libzip_plugin.rc.o
 endif
 endif
 
-SOURCES_access_gnomevfs = gnomevfs.c
-SOURCES_access_eyetv = eyetv.m
-SOURCES_dc1394 = dc1394.c
-SOURCES_dv1394 = dv.c
-SOURCES_linsys_sdi = linsys/linsys_sdi.c linsys/linsys_sdi.h
-SOURCES_linsys_hdsdi = \
-	linsys/linsys_hdsdi.c \
-	linsys/linsys_sdiaudio.h \
-	linsys/linsys_sdivideo.h \
-	$(NULL)
-SOURCES_access_mtp = mtp.c
-SOURCES_access_imem = imem.c
-SOURCES_access_attachment = attachment.c
-SOURCES_access_vdr = vdr.c
-SOURCES_libbluray = bluray.c
 
-librar_plugin_la_SOURCES = rar/rar.c rar/rar.h \
-	rar/access.c rar/stream.c rar/module.c
-librar_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
-
-if HAVE_DECKLINK
-libdecklink_plugin_la_SOURCES = decklink.cpp
-libdecklink_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(CPPFLAGS_decklink)
-libdecklink_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_decklink) -ldl
-libvlc_LTLIBRARIES += libdecklink_plugin.la
-if HAVE_WIN32
-libdecklink_plugin_la_DEPENDENCIES = libdecklink_plugin.rc.o
-endif
-endif
-
-if HAVE_QTKIT
-libqtcapture_plugin_la_SOURCES = qtcapture.m
-libqtcapture_plugin_la_LIBADDD = $(AM_LIBADD)
-libqtcapture_plugin_la_LDFLAGS = -Wl,-framework,QTKit -Wl,-framework,CoreVideo -Wl,-framework,QuartzCore
-
-libqtsound_plugin_la_SOURCES = qtsound.m
-libqtsound_plugin_la_LIBADD = $(AM_LIBADD)
-libqtsound_plugin_la_LDFLAGS = -Wl,-framework,QTKit -Wl,-framework,CoreAudio
-
-libvlc_LTLIBRARIES += \
-        libqtcapture_plugin.la \
-        libqtsound_plugin.la \
-        $(NULL)
-endif
-
-if HAVE_AVFOUNDATION
-libavcapture_plugin_la_SOURCES = avcapture.m
-libavcapture_plugin_la_LIBADD = $(AM_LIBADD)
-libavcapture_plugin_la_LDFLAGS = -Wl,-framework,AVFoundation -Wl,-framework,CoreMedia
+### Audio capture ###
 
-libvlc_LTLIBRARIES += \
-        libavcapture_plugin.la \
-        $(NULL)
+libaccess_alsa_plugin_la_SOURCES = alsa.c
+libaccess_alsa_plugin_la_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS)
+libaccess_alsa_plugin_la_LIBADD = $(AM_LIBADD) $(ALSA_LIBS)
+if HAVE_ALSA
+libvlc_LTLIBRARIES += libaccess_alsa_plugin.la
 endif
 
-libvlc_LTLIBRARIES += \
-	libfilesystem_plugin.la \
-	libidummy_plugin.la \
-	libaccess_udp_plugin.la \
-	libaccess_tcp_plugin.la \
-	libaccess_http_plugin.la \
-	libaccess_ftp_plugin.la \
-	libaccess_imem_plugin.la \
-	libaccess_attachment_plugin.la \
-	librar_plugin.la \
-        libsdp_plugin.la \
-	libtimecode_plugin.la \
-	libaccess_vdr_plugin.la \
-	$(NULL)
-
-
-### Audio capture ###
-
 libaccess_oss_plugin_la_SOURCES = oss.c
 libaccess_oss_plugin_la_CFLAGS = $(AM_CFLAGS)
 libaccess_oss_plugin_la_LIBADD = $(AM_LIBADD) $(OSS_LIBS)
@@ -135,13 +79,6 @@ if HAVE_OSS
 libvlc_LTLIBRARIES += libaccess_oss_plugin.la
 endif
 
-libaccess_alsa_plugin_la_SOURCES = alsa.c
-libaccess_alsa_plugin_la_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS)
-libaccess_alsa_plugin_la_LIBADD = $(AM_LIBADD) $(ALSA_LIBS)
-if HAVE_ALSA
-libvlc_LTLIBRARIES += libaccess_alsa_plugin.la
-endif
-
 libaccess_jack_plugin_la_SOURCES = jack.c
 libaccess_jack_plugin_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS)
 libaccess_jack_plugin_la_LIBADD = $(AM_LIBADD) $(JACK_LIBS)
@@ -151,15 +88,57 @@ endif
 
 libpulsesrc_plugin_la_SOURCES = pulse.c
 libpulsesrc_plugin_la_CFLAGS= $(AM_CFLAGS) $(PULSE_CFLAGS)
-libpulsesrc_plugin_la_LIBADD = ../libvlc_pulse.la \
-	$(AM_LIBADD) $(PULSE_LIBS)
+libpulsesrc_plugin_la_LIBADD = ../libvlc_pulse.la $(AM_LIBADD) $(PULSE_LIBS)
 if HAVE_PULSE
 libvlc_LTLIBRARIES += libpulsesrc_plugin.la
 endif
 
+libqtsound_plugin_la_SOURCES = qtsound.m
+libqtsound_plugin_la_LDFLAGS = -Wl,-framework,QTKit -Wl,-framework,CoreAudio
+if HAVE_QTKIT
+libvlc_LTLIBRARIES += libqtsound_plugin.la
+endif
+
 
 ### Video capture ###
 
+libavcapture_plugin_la_SOURCES = avcapture.m
+libavcapture_plugin_la_LDFLAGS = \
+	-Wl,-framework,AVFoundation -Wl,-framework,CoreMedia
+if HAVE_AVFOUNDATION
+libvlc_LTLIBRARIES += libavcapture_plugin.la
+endif
+
+libdc1394_plugin_la_SOURCES = dc1394.c
+libdc1394_plugin_la_CFLAGS = $(AM_CFLAGS) $(DC1394_CFLAGS)
+libdc1394_plugin_la_LIBADD = $(AM_LIBADD) $(DC1394_LIBS)
+libvlc_LTLIBRARIES += $(LTLIBdc1394)
+EXTRA_LTLIBRARIES += libdc1394_plugin.la
+
+libdv1394_plugin_la_SOURCES = dv.c
+libdv1394_plugin_la_CFLAGS = $(AM_CFLAGS) $(DV1394_CFLAGS)
+libdv1394_plugin_la_LIBADD = $(AM_LIBADD) $(DV1394_LIBS)
+libvlc_LTLIBRARIES += $(LTLIBdv1394)
+EXTRA_LTLIBRARIES += libdv1394_plugin.la
+
+liblinsys_hdsdi_plugin_la_SOURCES = \
+	linsys/linsys_sdiaudio.h \
+	linsys/linsys_sdivideo.h \
+	linsys/linsys_hdsdi.c
+liblinsys_hdsdi_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+liblinsys_sdi_plugin_la_SOURCES = linsys/linsys_sdi.c linsys/linsys_sdi.h
+liblinsys_sdi_plugin_la_CFLAGS = $(AM_CFLAGS) $(LINSYS_SDI_CFLAGS)
+liblinsys_sdi_plugin_la_LIBADD = $(AM_LIBADD) $(LINSYS_SDI_LIBS)
+libvlc_LTLIBRARIES += $(LTLIBlinsys_hdsdi) $(LTLIBlinsys_sdi)
+EXTRA_LTLIBRARIES += liblinsys_hdsdi_plugin.la liblinsys_sdi_plugin.la
+
+libdecklink_plugin_la_SOURCES = decklink.cpp
+libdecklink_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(CPPFLAGS_decklink)
+libdecklink_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_decklink) -ldl
+if HAVE_DECKLINK
+libvlc_LTLIBRARIES += libdecklink_plugin.la
+endif
+
 libshm_plugin_la_SOURCES = shm.c
 libshm_plugin_la_CFLAGS = $(AM_CFLAGS)
 libshm_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
@@ -168,6 +147,13 @@ libshm_plugin_la_DEPENDENCIES = libshm_plugin.rc.o
 endif
 libvlc_LTLIBRARIES += libshm_plugin.la
 
+libqtcapture_plugin_la_SOURCES = qtcapture.m
+libqtcapture_plugin_la_LDFLAGS = \
+	-Wl,-framework,QTKit -Wl,-framework,CoreVideo -Wl,-framework,QuartzCore
+if HAVE_QTKIT
+libvlc_LTLIBRARIES += libqtcapture_plugin.la
+endif
+
 libv4l2_plugin_la_SOURCES = \
 	v4l2/linux/videodev2.h \
 	v4l2/linux/v4l2-common.h \
@@ -226,32 +212,74 @@ libscreen_plugin_la_LDFLAGS += "-Wl,-framework,OpenGL,-framework,ApplicationServ
 libvlc_LTLIBRARIES += libscreen_plugin.la
 endif
 
-### VNC ###
-SOURCES_libvnc = vnc.c
+librdp_plugin_la_SOURCES = rdp.c
+librdp_plugin_la_CFLAGS = $(AM_CFLAGS) $(FREERDP_CFLAGSp)
+librdp_plugin_la_LIBADD = $(AM_LIBADD) $(FREERDP_LIBS)
+libvlc_LTLIBRARIES += $(LTLIBrdp)
+EXTRA_LTLIBRARIES += librdp_plugin.la
+
+libvnc_plugin_la_SOURCES = vnc.c
+libvnc_plugin_la_CFLAGS = $(AM_CFLAGS) $(VNC_CFLAGS)
+libvnc_plugin_la_LIBADD = $(AM_LIBADD) $(VNC_LIBS)
+libvlc_LTLIBRARIES += $(LTLIBvnc)
+EXTRA_LTLIBRARIES += libvnc_plugin.la
 
-### RDP / Remote Desktop ###
-SOURCES_rdp = rdp.c
 
 ### Optical media ###
 
-SOURCES_cdda = \
-        cdda.c \
-        vcd/cdrom.c \
-        vcd/cdrom.h \
-        vcd/cdrom_internals.h
-SOURCES_vcd = \
-	vcd/vcd.c \
-	vcd/cdrom.c \
-	vcd/cdrom.h \
-	vcd/cdrom_internals.h
-SOURCES_vcdx = \
+libvlc_cdrom_la_SOURCES = vcd/cdrom.c vcd/cdrom.h vcd/cdrom_internals.h
+libvlc_cdrom_la_CPPFLAGS = -DMODULE_STRING=\"cdrom\"
+libvlc_cdrom_la_LDFLAGS = -static
+EXTRA_LTLIBRARIES += libvlc_cdrom.la
+
+libcdda_plugin_la_SOURCES = cdda.c
+libcdda_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libcdda_plugin_la_LIBADD = libvlc_cdrom.la $(AM_LIBADD)
+if HAVE_DARWIN
+libcdda_plugin_la_LIBADD += -liconv
+endif
+EXTRA_LTLIBRARIES += libcdda_plugin.la
+libvlc_LTLIBRARIES += $(LTLIBcdda)
+
+libvcd_plugin_la_SOURCES = vcd/vcd.c
+libvcd_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libvcd_plugin_la_LIBADD = libvlc_cdrom.la $(AM_LIBADD)
+if HAVE_DARWIN
+libvcd_plugin_la_LIBADD += -liconv
+endif
+EXTRA_LTLIBRARIES += libvcd_plugin.la
+libvlc_LTLIBRARIES += $(LTLIBvcd)
+
+libvcdx_plugin_la_SOURCES = \
 	vcdx/access.h vcdx/access.c \
 	vcdx/vcd.c vcdx/vcd.h \
 	vcdx/vcdplayer.h vcdx/vcdplayer.c \
 	vcdx/info.c vcdx/info.h
-
-SOURCES_dvdnav = dvdnav.c
-SOURCES_dvdread = dvdread.c
+libvcdx_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libvcdx_plugin_la_LIBADD = $(AM_LIBADD)
+if HAVE_WIN32
+libvcdx_plugin_la_LIBADD += -lwinmm
+endif
+EXTRA_LTLIBRARIES += libvcdx_plugin.la
+libvlc_LTLIBRARIES += $(LTLIBvcdx)
+
+libdvdnav_plugin_la_SOURCES = dvdnav.c
+libdvdnav_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVDNAV_CFLAGS)
+libdvdnav_plugin_la_LIBADD = $(AM_LIBADD) $(DVDNAV_LIBS)
+libvlc_LTLIBRARIES += $(LTLIBdvdnav)
+EXTRA_LTLIBRARIES += libdvdnav_plugin.la
+
+libdvdread_plugin_la_SOURCES = dvdread.c
+libdvdread_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVDREAD_CFLAGS)
+libdvdread_plugin_la_LIBADD = $(AM_LIBADD) $(DVDREAD_LIBS)
+libvlc_LTLIBRARIES += $(LTLIBdvdread)
+EXTRA_LTLIBRARIES += libdvdread_plugin.la
+
+liblibbluray_plugin_la_SOURCES = bluray.c
+liblibbluray_plugin_la_CFLAGS = $(AM_CFLAGS) $(BLURAY_CFLAGS)
+liblibbluray_plugin_la_LIBADD = $(AM_LIBADD) $(BLURAY_LIBS)
+libvlc_LTLIBRARIES += $(LTLIBlibbluray)
+EXTRA_LTLIBRARIES += liblibbluray_plugin.la
 
 libaccess_bd_plugin_la_SOURCES = bd/bd.c bd/mpls.c bd/mpls.h bd/clpi.c bd/clpi.h
 libaccess_bd_plugin_la_CFLAGS = $(AM_CFLAGS)
@@ -312,24 +340,35 @@ libdvb_plugin_la_LIBADD += $(DVBPSI_LIBS)
 endif
 endif
 
+libaccess_eyetv_plugin_la_SOURCES = eyetv.m
+libaccess_eyetv_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libaccess_eyetv_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,Foundation
+libvlc_LTLIBRARIES += $(LTLIBaccess_eyetv)
+EXTRA_LTLIBRARIES += libaccess_eyetv_plugin.la
+
+
 ### Network streams ###
 
-libaccess_smb_plugin_la_SOURCES = smb.c
-libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS) $(SMBCLIENT_CFLAGS)
-libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(SMBCLIENT_LIBS)
-if HAVE_WIN32
-libaccess_smb_plugin_la_LIBADD += -lmpr
-libaccess_smb_plugin_la_DEPENDENCIES = libaccess_smb_plugin.rc.o
+libftp_plugin_la_SOURCES = ftp.c
+libftp_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libftp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
+libvlc_LTLIBRARIES += libftp_plugin.la
+
+libhttp_plugin_la_SOURCES = http.c
+libhttp_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libhttp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
+if HAVE_ZLIB
+libhttp_plugin_la_LIBADD += -lz
 endif
-libvlc_LTLIBRARIES += $(LTLIBaccess_smb)
-EXTRA_LTLIBRARIES += libaccess_smb_plugin.la
+libvlc_LTLIBRARIES += libhttp_plugin.la
 
-SOURCES_access_udp = udp.c
-SOURCES_access_tcp = tcp.c
-SOURCES_access_http = http.c
-SOURCES_access_ftp = ftp.c
-SOURCES_access_sftp = sftp.c
-SOURCES_live555 = live555.cpp mms/asf.c mms/buffer.c
+liblive555_plugin_la_SOURCES = live555.cpp mms/asf.c mms/buffer.c
+liblive555_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+liblive555_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS_live555)
+liblive555_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_live555)
+liblive555_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_live555)
+libvlc_LTLIBRARIES += $(LTLIBlive555)
+EXTRA_LTLIBRARIES += liblive555_plugin.la
 
 libaccess_mms_plugin_la_SOURCES = \
 	mms/mms.c mms/mms.h \
@@ -341,10 +380,31 @@ libaccess_mms_plugin_la_SOURCES = \
 libaccess_mms_plugin_la_CFLAGS = $(AM_CFLAGS)
 libaccess_mms_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
 libvlc_LTLIBRARIES += libaccess_mms_plugin.la
+
+libsmb_plugin_la_SOURCES = smb.c
+libsmb_plugin_la_CFLAGS = $(AM_CFLAGS) $(SMBCLIENT_CFLAGS)
+libsmb_plugin_la_LIBADD = $(AM_LIBADD) $(SMBCLIENT_LIBS)
 if HAVE_WIN32
-libaccess_mms_plugin_la_DEPENDENCIES = libaccess_mms_plugin.rc.o
+libsmb_plugin_la_LIBADD += -lmpr
 endif
+libvlc_LTLIBRARIES += $(LTLIBsmb)
+EXTRA_LTLIBRARIES += libsmb_plugin.la
 
+libtcp_plugin_la_SOURCES = tcp.c
+libtcp_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libtcp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
+libvlc_LTLIBRARIES += libtcp_plugin.la
+
+libudp_plugin_la_SOURCES = udp.c
+libudp_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libudp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
+libvlc_LTLIBRARIES += libudp_plugin.la
+
+libsftp_plugin_la_SOURCES = sftp.c
+libsftp_plugin_la_CFLAGS = $(AM_CFLAGS) $(SFTP_CFLAGS)
+libsftp_plugin_la_LIBADD = $(AM_LIBADD) $(SFTP_LIBS)
+libvlc_LTLIBRARIES += $(LTLIBsftp)
+EXTRA_LTLIBRARIES += libsftp_plugin.la
 
 libaccess_realrtsp_plugin_la_SOURCES = \
 	rtsp/access.c \
@@ -368,3 +428,18 @@ libavio_plugin_la_LIBADD = $(AM_LIBADD) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(LIBM)
 if HAVE_AVFORMAT
 libvlc_LTLIBRARIES += libavio_plugin.la
 endif
+
+
+### Misc ###
+
+libgnomevfs_plugin_la_SOURCES = gnomevfs.c
+libgnomevfs_plugin_la_CFLAGS = $(AM_CFLAGS) $(GNOMEVFS_CFLAGS)
+libgnomevfs_plugin_la_LIBADD = $(AM_LIBADD) $(GNOMEVFS_LIBS)
+libvlc_LTLIBRARIES += $(LTLIBgnomevfs)
+EXTRA_LTLIBRARIES += libgnomevfs_plugin.la
+
+libaccess_mtp_plugin_la_SOURCES = mtp.c
+libaccess_mtp_plugin_la_CFLAGS = $(AM_CFLAGS) $(MTP_CFLAGS)
+libaccess_mtp_plugin_la_LIBADD = $(AM_LIBADD) $(MTP_LIBS)
+libvlc_LTLIBRARIES += $(LTLIBaccess_mtp)
+EXTRA_LTLIBRARIES += libaccess_mtp_plugin.la