Skip to content

V
vlc-2-2
Commit fc25a3a1 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

access: remove recursion 

If you missed the fact that recursive makefiles are harmful, there is
plenty of documentation online (try "Recursive makefiles considered
harmful"), or ask the libav developers for the more concise version.

This change and the previous ones, are particularly boring though. The
main motivation is to eventually address #9397, after the same change is
applied to codec/, demux/ and possibly a few other subdirectories.

Note that some more simplification between Makefile.am files and
configure.ac is definitely possible - if someone is bored.
parent 98cea7a2
Show whitespace changes
Inline Side-by-side
Showing with 99 additions and 99 deletions
configure.ac
View file @ fc25a3a1
...@@ -4231,7 +4231,6 @@ AC_CONFIG_FILES([ ...@@ -4231,7 +4231,6 @@ AC_CONFIG_FILES([
lib/Makefile lib/Makefile
bin/Makefile bin/Makefile
test/Makefile test/Makefile
modules/access/Makefile
modules/access/rtp/Makefile modules/access/rtp/Makefile
modules/access_output/Makefile modules/access_output/Makefile
modules/audio_filter/Makefile modules/audio_filter/Makefile
......
modules/Makefile.am
View file @ fc25a3a1
noinst_LTLIBRARIES = noinst_LTLIBRARIES =
BASE_SUBDIRS = \ BASE_SUBDIRS = \
access \ access/rtp \
audio_filter \ audio_filter \
audio_mixer \ audio_mixer \
audio_output \ audio_output \
...@@ -55,6 +55,9 @@ if HAVE_PULSE ...@@ -55,6 +55,9 @@ if HAVE_PULSE
noinst_LTLIBRARIES += libvlc_pulse.la noinst_LTLIBRARIES += libvlc_pulse.la
endif endif
include common.am
include access/Makefile.am
if HAVE_WIN32 if HAVE_WIN32
module.rc: $(top_builddir)/modules/module.rc.in $(top_builddir)/config.status module.rc: $(top_builddir)/modules/module.rc.in $(top_builddir)/config.status
$(AM_V_GEN) cd "$(top_builddir)" && $(SHELL) ./config.status --file="modules/$@" $(AM_V_GEN) cd "$(top_builddir)" && $(SHELL) ./config.status --file="modules/$@"
......
modules/access/Makefile.am
View file @ fc25a3a1
SUBDIRS = rtp accessdir = $(pluginsdir)/access
noinst_LTLIBRARIES =
access_LTLIBRARIES = access_LTLIBRARIES =
EXTRA_LTLIBRARIES = EXTRA_LTLIBRARIES =
include ../common.am AM_CPPFLAGS += -I$(srcdir)/access
accessdir = $(pluginsdir)/access
### Files ### ### Files ###
libattachment_plugin_la_SOURCES = attachment.c libattachment_plugin_la_SOURCES = access/attachment.c
access_LTLIBRARIES += libattachment_plugin.la access_LTLIBRARIES += libattachment_plugin.la
libfilesystem_plugin_la_SOURCES = fs.h file.c directory.c fs.c libfilesystem_plugin_la_SOURCES = access/fs.h access/file.c access/directory.c access/fs.c
if HAVE_WIN32 if HAVE_WIN32
libfilesystem_plugin_la_LIBADD = -lshlwapi libfilesystem_plugin_la_LIBADD = -lshlwapi
endif endif
access_LTLIBRARIES += libfilesystem_plugin.la access_LTLIBRARIES += libfilesystem_plugin.la
libidummy_plugin_la_SOURCES = idummy.c libidummy_plugin_la_SOURCES = access/idummy.c
access_LTLIBRARIES += libidummy_plugin.la access_LTLIBRARIES += libidummy_plugin.la
libimem_plugin_la_SOURCES = imem.c libimem_plugin_la_SOURCES = access/imem.c
libimem_plugin_la_LIBADD = $(LIBM) libimem_plugin_la_LIBADD = $(LIBM)
access_LTLIBRARIES += libimem_plugin.la access_LTLIBRARIES += libimem_plugin.la
librar_plugin_la_SOURCES = rar/rar.c rar/rar.h \ librar_plugin_la_SOURCES = access/rar/rar.c access/rar/rar.h \
rar/access.c rar/stream.c rar/module.c access/rar/access.c access/rar/stream.c access/rar/module.c
access_LTLIBRARIES += librar_plugin.la access_LTLIBRARIES += librar_plugin.la
libsdp_plugin_la_SOURCES = sdp.c libsdp_plugin_la_SOURCES = access/sdp.c
access_LTLIBRARIES += libsdp_plugin.la access_LTLIBRARIES += libsdp_plugin.la
libtimecode_plugin_la_SOURCES = timecode.c libtimecode_plugin_la_SOURCES = access/timecode.c
access_LTLIBRARIES += libtimecode_plugin.la access_LTLIBRARIES += libtimecode_plugin.la
libvdr_plugin_la_SOURCES = vdr.c libvdr_plugin_la_SOURCES = access/vdr.c
access_LTLIBRARIES += libvdr_plugin.la access_LTLIBRARIES += libvdr_plugin.la
libzip_plugin_la_SOURCES = zip/zip.h zip/zipstream.c zip/zipaccess.c libzip_plugin_la_SOURCES = access/zip/zip.h access/zip/zipstream.c access/zip/zipaccess.c
libzip_plugin_la_CFLAGS = $(AM_CFLAGS) $(MINIZIP_CFLAGS) libzip_plugin_la_CFLAGS = $(AM_CFLAGS) $(MINIZIP_CFLAGS)
libzip_plugin_la_LIBADD = $(MINIZIP_LIBS) libzip_plugin_la_LIBADD = $(MINIZIP_LIBS)
libunzip_la_SOURCES = zip/unzip/unzip.c zip/unzip/unzip.h zip/unzip/crypt.h \ libunzip_la_SOURCES = access/zip/unzip/unzip.c access/zip/unzip/unzip.h access/zip/unzip/crypt.h \
zip/unzip/ioapi.c zip/unzip/ioapi.h access/zip/unzip/ioapi.c access/zip/unzip/ioapi.h
libunzip_la_LIBADD = -lz libunzip_la_LIBADD = -lz
libunzip_la_LDFLAGS = -static libunzip_la_LDFLAGS = -static
if HAVE_ZLIB if HAVE_ZLIB
access_LTLIBRARIES += libzip_plugin.la access_LTLIBRARIES += libzip_plugin.la
if !HAVE_MINIZIP if !HAVE_MINIZIP
noinst_LTLIBRARIES += libunzip.la noinst_LTLIBRARIES += libunzip.la
libzip_plugin_la_CFLAGS += -I$(srcdir)/zip/unzip libzip_plugin_la_CFLAGS += -I$(srcdir)/access/zip/unzip
libzip_plugin_la_LIBADD += libunzip.la libzip_plugin_la_LIBADD += libunzip.la
endif endif
endif endif
...@@ -56,34 +54,34 @@ endif ...@@ -56,34 +54,34 @@ endif
### Audio capture ### ### Audio capture ###
libaccess_alsa_plugin_la_SOURCES = alsa.c libaccess_alsa_plugin_la_SOURCES = access/alsa.c
libaccess_alsa_plugin_la_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS) libaccess_alsa_plugin_la_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS)
libaccess_alsa_plugin_la_LIBADD = $(ALSA_LIBS) libaccess_alsa_plugin_la_LIBADD = $(ALSA_LIBS)
if HAVE_ALSA if HAVE_ALSA
access_LTLIBRARIES += libaccess_alsa_plugin.la access_LTLIBRARIES += libaccess_alsa_plugin.la
endif endif
libaccess_oss_plugin_la_SOURCES = oss.c libaccess_oss_plugin_la_SOURCES = access/oss.c
libaccess_oss_plugin_la_LIBADD = $(OSS_LIBS) libaccess_oss_plugin_la_LIBADD = $(OSS_LIBS)
if HAVE_OSS if HAVE_OSS
access_LTLIBRARIES += libaccess_oss_plugin.la access_LTLIBRARIES += libaccess_oss_plugin.la
endif endif
libaccess_jack_plugin_la_SOURCES = jack.c libaccess_jack_plugin_la_SOURCES = access/jack.c
libaccess_jack_plugin_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS) libaccess_jack_plugin_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS)
libaccess_jack_plugin_la_LIBADD = $(JACK_LIBS) libaccess_jack_plugin_la_LIBADD = $(JACK_LIBS)
if HAVE_JACK if HAVE_JACK
access_LTLIBRARIES += libaccess_jack_plugin.la access_LTLIBRARIES += libaccess_jack_plugin.la
endif endif
libpulsesrc_plugin_la_SOURCES = pulse.c libpulsesrc_plugin_la_SOURCES = access/pulse.c
libpulsesrc_plugin_la_CFLAGS= $(AM_CFLAGS) $(PULSE_CFLAGS) libpulsesrc_plugin_la_CFLAGS= $(AM_CFLAGS) $(PULSE_CFLAGS)
libpulsesrc_plugin_la_LIBADD = ../libvlc_pulse.la $(PULSE_LIBS) libpulsesrc_plugin_la_LIBADD = libvlc_pulse.la $(PULSE_LIBS)
if HAVE_PULSE if HAVE_PULSE
access_LTLIBRARIES += libpulsesrc_plugin.la access_LTLIBRARIES += libpulsesrc_plugin.la
endif endif
libqtsound_plugin_la_SOURCES = qtsound.m libqtsound_plugin_la_SOURCES = access/qtsound.m
libqtsound_plugin_la_LDFLAGS = -Wl,-framework,QTKit -Wl,-framework,CoreAudio libqtsound_plugin_la_LDFLAGS = -Wl,-framework,QTKit -Wl,-framework,CoreAudio
if HAVE_QTKIT if HAVE_QTKIT
access_LTLIBRARIES += libqtsound_plugin.la access_LTLIBRARIES += libqtsound_plugin.la
...@@ -92,21 +90,21 @@ endif ...@@ -92,21 +90,21 @@ endif
### Video capture ### ### Video capture ###
libavcapture_plugin_la_SOURCES = avcapture.m libavcapture_plugin_la_SOURCES = access/avcapture.m
libavcapture_plugin_la_LDFLAGS = \ libavcapture_plugin_la_LDFLAGS = \
-Wl,-framework,AVFoundation -Wl,-framework,CoreMedia -Wl,-framework,AVFoundation -Wl,-framework,CoreMedia
if HAVE_AVFOUNDATION if HAVE_AVFOUNDATION
access_LTLIBRARIES += libavcapture_plugin.la access_LTLIBRARIES += libavcapture_plugin.la
endif endif
libdc1394_plugin_la_SOURCES = dc1394.c libdc1394_plugin_la_SOURCES = access/dc1394.c
libdc1394_plugin_la_CFLAGS = $(AM_CFLAGS) $(DC1394_CFLAGS) libdc1394_plugin_la_CFLAGS = $(AM_CFLAGS) $(DC1394_CFLAGS)
libdc1394_plugin_la_LIBADD = $(DC1394_LIBS) libdc1394_plugin_la_LIBADD = $(DC1394_LIBS)
libdc1394_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' libdc1394_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
access_LTLIBRARIES += $(LTLIBdc1394) access_LTLIBRARIES += $(LTLIBdc1394)
EXTRA_LTLIBRARIES += libdc1394_plugin.la EXTRA_LTLIBRARIES += libdc1394_plugin.la
libdv1394_plugin_la_SOURCES = dv.c libdv1394_plugin_la_SOURCES = access/dv.c
libdv1394_plugin_la_CFLAGS = $(AM_CFLAGS) $(DV1394_CFLAGS) libdv1394_plugin_la_CFLAGS = $(AM_CFLAGS) $(DV1394_CFLAGS)
libdv1394_plugin_la_LIBADD = $(DV1394_LIBS) libdv1394_plugin_la_LIBADD = $(DV1394_LIBS)
libdv1394_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' libdv1394_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
...@@ -114,32 +112,32 @@ access_LTLIBRARIES += $(LTLIBdv1394) ...@@ -114,32 +112,32 @@ access_LTLIBRARIES += $(LTLIBdv1394)
EXTRA_LTLIBRARIES += libdv1394_plugin.la EXTRA_LTLIBRARIES += libdv1394_plugin.la
liblinsys_hdsdi_plugin_la_SOURCES = \ liblinsys_hdsdi_plugin_la_SOURCES = \
linsys/linsys_sdiaudio.h \ access/linsys/linsys_sdiaudio.h \
linsys/linsys_sdivideo.h \ access/linsys/linsys_sdivideo.h \
linsys/linsys_hdsdi.c access/linsys/linsys_hdsdi.c
liblinsys_hdsdi_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' liblinsys_hdsdi_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
liblinsys_sdi_plugin_la_SOURCES = linsys/linsys_sdi.c linsys/linsys_sdi.h liblinsys_sdi_plugin_la_SOURCES = access/linsys/linsys_sdi.c access/linsys/linsys_sdi.h
liblinsys_sdi_plugin_la_CFLAGS = $(AM_CFLAGS) $(LINSYS_SDI_CFLAGS) liblinsys_sdi_plugin_la_CFLAGS = $(AM_CFLAGS) $(LINSYS_SDI_CFLAGS)
liblinsys_sdi_plugin_la_LIBADD = $(LINSYS_SDI_LIBS) liblinsys_sdi_plugin_la_LIBADD = $(LINSYS_SDI_LIBS)
liblinsys_sdi_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' liblinsys_sdi_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
access_LTLIBRARIES += $(LTLIBlinsys_hdsdi) $(LTLIBlinsys_sdi) access_LTLIBRARIES += $(LTLIBlinsys_hdsdi) $(LTLIBlinsys_sdi)
EXTRA_LTLIBRARIES += liblinsys_hdsdi_plugin.la liblinsys_sdi_plugin.la EXTRA_LTLIBRARIES += liblinsys_hdsdi_plugin.la liblinsys_sdi_plugin.la
libdecklink_plugin_la_SOURCES = decklink.cpp libdecklink_plugin_la_SOURCES = access/decklink.cpp
libdecklink_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(CPPFLAGS_decklink) libdecklink_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(CPPFLAGS_decklink)
libdecklink_plugin_la_LIBADD = $(LIBS_decklink) -ldl libdecklink_plugin_la_LIBADD = $(LIBS_decklink) -ldl
if HAVE_DECKLINK if HAVE_DECKLINK
access_LTLIBRARIES += libdecklink_plugin.la access_LTLIBRARIES += libdecklink_plugin.la
endif endif
libshm_plugin_la_SOURCES = shm.c libshm_plugin_la_SOURCES = access/shm.c
libshm_plugin_la_LIBADD = $(LIBM) libshm_plugin_la_LIBADD = $(LIBM)
if HAVE_WIN32 if HAVE_WIN32
libshm_plugin_la_DEPENDENCIES = libshm_plugin.rc.o libshm_plugin_la_DEPENDENCIES = libshm_plugin.rc.o
endif endif
access_LTLIBRARIES += libshm_plugin.la access_LTLIBRARIES += libshm_plugin.la
libqtcapture_plugin_la_SOURCES = qtcapture.m libqtcapture_plugin_la_SOURCES = access/qtcapture.m
libqtcapture_plugin_la_LDFLAGS = \ libqtcapture_plugin_la_LDFLAGS = \
-Wl,-framework,QTKit -Wl,-framework,CoreVideo -Wl,-framework,QuartzCore -Wl,-framework,QTKit -Wl,-framework,CoreVideo -Wl,-framework,QuartzCore
if HAVE_QTKIT if HAVE_QTKIT
...@@ -147,27 +145,27 @@ access_LTLIBRARIES += libqtcapture_plugin.la ...@@ -147,27 +145,27 @@ access_LTLIBRARIES += libqtcapture_plugin.la
endif endif
libv4l2_plugin_la_SOURCES = \ libv4l2_plugin_la_SOURCES = \
v4l2/linux/videodev2.h \ access/v4l2/linux/videodev2.h \
v4l2/linux/v4l2-common.h \ access/v4l2/linux/v4l2-common.h \
v4l2/linux/v4l2-controls.h \ access/v4l2/linux/v4l2-controls.h \
v4l2/v4l2.c \ access/v4l2/v4l2.c \
v4l2/video.c \ access/v4l2/video.c \
v4l2/vbi.c \ access/v4l2/vbi.c \
v4l2/demux.c \ access/v4l2/demux.c \
v4l2/access.c \ access/v4l2/access.c \
v4l2/radio.c \ access/v4l2/radio.c \
v4l2/controls.c \ access/v4l2/controls.c \
v4l2/lib.c \ access/v4l2/lib.c \
v4l2/v4l2.h access/v4l2/v4l2.h
libv4l2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/v4l2 libv4l2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/access/v4l2
libv4l2_plugin_la_CFLAGS = $(AM_CFLAGS) $(ZVBI_CFLAGS) libv4l2_plugin_la_CFLAGS = $(AM_CFLAGS) $(ZVBI_CFLAGS)
libv4l2_plugin_la_LIBADD = $(LIBDL) $(LIBM) $(ZVBI_LIBS) libv4l2_plugin_la_LIBADD = $(LIBDL) $(LIBM) $(ZVBI_LIBS)
if HAVE_V4L2 if HAVE_V4L2
access_LTLIBRARIES += libv4l2_plugin.la access_LTLIBRARIES += libv4l2_plugin.la
endif endif
libdshow_plugin_la_SOURCES = dshow/vlc_dshow.h dshow/dshow.cpp dshow/access.h \ libdshow_plugin_la_SOURCES = access/dshow/vlc_dshow.h access/dshow/dshow.cpp access/dshow/access.h \
dshow/filter.cpp dshow/filter.h dshow/crossbar.cpp access/dshow/filter.cpp access/dshow/filter.h access/dshow/crossbar.cpp
libdshow_plugin_la_LIBADD = -lole32 -loleaut32 -luuid -lstrmiids -lksuser libdshow_plugin_la_LIBADD = -lole32 -loleaut32 -luuid -lstrmiids -lksuser
if HAVE_WIN32 if HAVE_WIN32
access_LTLIBRARIES += libdshow_plugin.la access_LTLIBRARIES += libdshow_plugin.la
...@@ -177,7 +175,7 @@ endif ...@@ -177,7 +175,7 @@ endif
### Screen grab ### ### Screen grab ###
libxcb_screen_plugin_la_SOURCES = screen/xcb.c libxcb_screen_plugin_la_SOURCES = access/screen/xcb.c
libxcb_screen_plugin_la_CFLAGS = $(AM_CFLAGS) \ libxcb_screen_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(XCB_CFLAGS) $(XCB_COMPOSITE_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_CFLAGS) $(XCB_COMPOSITE_CFLAGS) $(XCB_SHM_CFLAGS)
libxcb_screen_plugin_la_LIBADD = $(XCB_LIBS) $(XCB_COMPOSITE_LIBS) $(XCB_SHM_LIBS) libxcb_screen_plugin_la_LIBADD = $(XCB_LIBS) $(XCB_COMPOSITE_LIBS) $(XCB_SHM_LIBS)
...@@ -185,28 +183,28 @@ if HAVE_XCB ...@@ -185,28 +183,28 @@ if HAVE_XCB
access_LTLIBRARIES += libxcb_screen_plugin.la access_LTLIBRARIES += libxcb_screen_plugin.la
endif endif
libscreen_plugin_la_SOURCES = screen/screen.c screen/screen.h libscreen_plugin_la_SOURCES = access/screen/screen.c access/screen/screen.h
libscreen_plugin_la_LDFLAGS = $(AM_LDFLAGS) libscreen_plugin_la_LDFLAGS = $(AM_LDFLAGS)
if HAVE_WIN32 if HAVE_WIN32
libscreen_plugin_la_SOURCES += screen/win32.c libscreen_plugin_la_SOURCES += access/screen/win32.c
libscreen_plugin_la_LIBADD = -lgdi32 libscreen_plugin_la_LIBADD = -lgdi32
access_LTLIBRARIES += libscreen_plugin.la access_LTLIBRARIES += libscreen_plugin.la
libscreen_plugin_la_DEPENDENCIES = libscreen_plugin.rc.o libscreen_plugin_la_DEPENDENCIES = libscreen_plugin.rc.o
endif endif
if HAVE_MAC_SCREEN if HAVE_MAC_SCREEN
libscreen_plugin_la_SOURCES += screen/mac.c libscreen_plugin_la_SOURCES += access/screen/mac.c
libscreen_plugin_la_LDFLAGS += "-Wl,-framework,OpenGL,-framework,ApplicationServices" libscreen_plugin_la_LDFLAGS += "-Wl,-framework,OpenGL,-framework,ApplicationServices"
access_LTLIBRARIES += libscreen_plugin.la access_LTLIBRARIES += libscreen_plugin.la
endif endif
librdp_plugin_la_SOURCES = rdp.c librdp_plugin_la_SOURCES = access/rdp.c
librdp_plugin_la_CFLAGS = $(AM_CFLAGS) $(FREERDP_CFLAGSp) librdp_plugin_la_CFLAGS = $(AM_CFLAGS) $(FREERDP_CFLAGSp)
librdp_plugin_la_LIBADD = $(FREERDP_LIBS) librdp_plugin_la_LIBADD = $(FREERDP_LIBS)
librdp_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' librdp_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
access_LTLIBRARIES += $(LTLIBrdp) access_LTLIBRARIES += $(LTLIBrdp)
EXTRA_LTLIBRARIES += librdp_plugin.la EXTRA_LTLIBRARIES += librdp_plugin.la
libvnc_plugin_la_SOURCES = vnc.c libvnc_plugin_la_SOURCES = access/vnc.c
libvnc_plugin_la_CFLAGS = $(AM_CFLAGS) $(VNC_CFLAGS) libvnc_plugin_la_CFLAGS = $(AM_CFLAGS) $(VNC_CFLAGS)
libvnc_plugin_la_LIBADD = $(VNC_LIBS) libvnc_plugin_la_LIBADD = $(VNC_LIBS)
libvnc_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' libvnc_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
...@@ -216,7 +214,7 @@ EXTRA_LTLIBRARIES += libvnc_plugin.la ...@@ -216,7 +214,7 @@ EXTRA_LTLIBRARIES += libvnc_plugin.la
### Optical media ### ### Optical media ###
libcdda_plugin_la_SOURCES = cdda.c vcd/cdrom.c vcd/cdrom.h vcd/cdrom_internals.h libcdda_plugin_la_SOURCES = access/cdda.c access/vcd/cdrom.c access/vcd/cdrom.h access/vcd/cdrom_internals.h
if HAVE_DARWIN if HAVE_DARWIN
libcdda_plugin_la_LIBADD = -liconv libcdda_plugin_la_LIBADD = -liconv
endif endif
...@@ -224,7 +222,7 @@ libcdda_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' ...@@ -224,7 +222,7 @@ libcdda_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
EXTRA_LTLIBRARIES += libcdda_plugin.la EXTRA_LTLIBRARIES += libcdda_plugin.la
access_LTLIBRARIES += $(LTLIBcdda) access_LTLIBRARIES += $(LTLIBcdda)
libvcd_plugin_la_SOURCES = vcd/vcd.c vcd/cdrom.c vcd/cdrom.h vcd/cdrom_internals.h libvcd_plugin_la_SOURCES = access/vcd/vcd.c access/vcd/cdrom.c access/vcd/cdrom.h access/vcd/cdrom_internals.h
if HAVE_DARWIN if HAVE_DARWIN
libvcd_plugin_la_LIBADD = -liconv libvcd_plugin_la_LIBADD = -liconv
endif endif
...@@ -233,10 +231,10 @@ EXTRA_LTLIBRARIES += libvcd_plugin.la ...@@ -233,10 +231,10 @@ EXTRA_LTLIBRARIES += libvcd_plugin.la
access_LTLIBRARIES += $(LTLIBvcd) access_LTLIBRARIES += $(LTLIBvcd)
libvcdx_plugin_la_SOURCES = \ libvcdx_plugin_la_SOURCES = \
vcdx/access.h vcdx/access.c \ access/vcdx/access.h access/vcdx/access.c \
vcdx/vcd.c vcdx/vcd.h \ access/vcdx/vcd.c access/vcdx/vcd.h \
vcdx/vcdplayer.h vcdx/vcdplayer.c \ access/vcdx/vcdplayer.h access/vcdx/vcdplayer.c \
vcdx/info.c vcdx/info.h access/vcdx/info.c access/vcdx/info.h
libvcdx_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) libvcdx_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
if HAVE_WIN32 if HAVE_WIN32
libvcdx_plugin_la_LIBADD = -lwinmm libvcdx_plugin_la_LIBADD = -lwinmm
...@@ -245,28 +243,28 @@ libvcdx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' ...@@ -245,28 +243,28 @@ libvcdx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
EXTRA_LTLIBRARIES += libvcdx_plugin.la EXTRA_LTLIBRARIES += libvcdx_plugin.la
access_LTLIBRARIES += $(LTLIBvcdx) access_LTLIBRARIES += $(LTLIBvcdx)
libdvdnav_plugin_la_SOURCES = dvdnav.c libdvdnav_plugin_la_SOURCES = access/dvdnav.c
libdvdnav_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVDNAV_CFLAGS) libdvdnav_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVDNAV_CFLAGS)
libdvdnav_plugin_la_LIBADD = $(DVDNAV_LIBS) libdvdnav_plugin_la_LIBADD = $(DVDNAV_LIBS)
libdvdnav_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' libdvdnav_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
access_LTLIBRARIES += $(LTLIBdvdnav) access_LTLIBRARIES += $(LTLIBdvdnav)
EXTRA_LTLIBRARIES += libdvdnav_plugin.la EXTRA_LTLIBRARIES += libdvdnav_plugin.la
libdvdread_plugin_la_SOURCES = dvdread.c libdvdread_plugin_la_SOURCES = access/dvdread.c
libdvdread_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVDREAD_CFLAGS) libdvdread_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVDREAD_CFLAGS)
libdvdread_plugin_la_LIBADD = $(DVDREAD_LIBS) libdvdread_plugin_la_LIBADD = $(DVDREAD_LIBS)
libdvdread_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' libdvdread_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
access_LTLIBRARIES += $(LTLIBdvdread) access_LTLIBRARIES += $(LTLIBdvdread)
EXTRA_LTLIBRARIES += libdvdread_plugin.la EXTRA_LTLIBRARIES += libdvdread_plugin.la
liblibbluray_plugin_la_SOURCES = bluray.c liblibbluray_plugin_la_SOURCES = access/bluray.c
liblibbluray_plugin_la_CFLAGS = $(AM_CFLAGS) $(BLURAY_CFLAGS) liblibbluray_plugin_la_CFLAGS = $(AM_CFLAGS) $(BLURAY_CFLAGS)
liblibbluray_plugin_la_LIBADD = $(BLURAY_LIBS) liblibbluray_plugin_la_LIBADD = $(BLURAY_LIBS)
liblibbluray_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' liblibbluray_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
access_LTLIBRARIES += $(LTLIBlibbluray) access_LTLIBRARIES += $(LTLIBlibbluray)
EXTRA_LTLIBRARIES += liblibbluray_plugin.la 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_SOURCES = access/bd/bd.c access/bd/mpls.c access/bd/mpls.h access/bd/clpi.c access/bd/clpi.h
access_LTLIBRARIES += libaccess_bd_plugin.la access_LTLIBRARIES += libaccess_bd_plugin.la
if HAVE_WIN32 if HAVE_WIN32
libaccess_bd_plugin_la_DEPENDENCIES = libaccess_bd_plugin.rc.o libaccess_bd_plugin_la_DEPENDENCIES = libaccess_bd_plugin.rc.o
...@@ -276,15 +274,15 @@ endif ...@@ -276,15 +274,15 @@ endif
### Digital TV ### ### Digital TV ###
libdtv_plugin_la_SOURCES = \ libdtv_plugin_la_SOURCES = \
dtv/dtv.h \ access/dtv/dtv.h \
dtv/access.c access/dtv/access.c
libdtv_plugin_la_CFLAGS = $(AM_CFLAGS) libdtv_plugin_la_CFLAGS = $(AM_CFLAGS)
if HAVE_LINUX_DVB if HAVE_LINUX_DVB
libdtv_plugin_la_SOURCES += dtv/linux.c libdtv_plugin_la_SOURCES += access/dtv/linux.c
libdtv_plugin_la_CFLAGS += -DHAVE_LINUX_DVB libdtv_plugin_la_CFLAGS += -DHAVE_LINUX_DVB
if HAVE_DVBPSI if HAVE_DVBPSI
libdtv_plugin_la_SOURCES += dtv/en50221.c dtv/en50221.h ../mux/mpeg/dvbpsi_compat.h libdtv_plugin_la_SOURCES += access/dtv/en50221.c access/dtv/en50221.h mux/mpeg/dvbpsi_compat.h
libdtv_plugin_la_CFLAGS += -DHAVE_DVBPSI $(DVBPSI_CFLAGS) libdtv_plugin_la_CFLAGS += -DHAVE_DVBPSI $(DVBPSI_CFLAGS)
libdtv_plugin_la_LIBADD = $(DVBPSI_LIBS) libdtv_plugin_la_LIBADD = $(DVBPSI_LIBS)
endif endif
...@@ -294,7 +292,7 @@ endif ...@@ -294,7 +292,7 @@ endif
if HAVE_WIN32 if HAVE_WIN32
# Work-around automake bug: # Work-around automake bug:
# Use an import library for C++ to retain C linker on other platforms. # Use an import library for C++ to retain C linker on other platforms.
libbda_la_SOURCES = dtv/bdadefs.h dtv/bdagraph.cpp dtv/bdagraph.hpp libbda_la_SOURCES = access/dtv/bdadefs.h access/dtv/bdagraph.cpp access/dtv/bdagraph.hpp
libbda_la_LDFLAGS = -static libbda_la_LDFLAGS = -static
libbda_la_LIBADD = -lstrmiids -lole32 -loleaut32 -luuid libbda_la_LIBADD = -lstrmiids -lole32 -loleaut32 -luuid
noinst_LTLIBRARIES += libbda.la noinst_LTLIBRARIES += libbda.la
...@@ -306,21 +304,21 @@ endif ...@@ -306,21 +304,21 @@ endif
# Old Linux DVB scanner # Old Linux DVB scanner
libdvb_plugin_la_SOURCES = \ libdvb_plugin_la_SOURCES = \
dvb/access.c \ access/dvb/access.c \
dvb/linux_dvb.c \ access/dvb/linux_dvb.c \
dvb/scan.c dvb/scan.h \ access/dvb/scan.c access/dvb/scan.h \
dvb/dvb.h access/dvb/dvb.h
libdvb_plugin_la_CFLAGS = $(AM_CFLAGS) libdvb_plugin_la_CFLAGS = $(AM_CFLAGS)
if HAVE_LINUX_DVB if HAVE_LINUX_DVB
if HAVE_DVBPSI if HAVE_DVBPSI
libdvb_plugin_la_SOURCES += ../mux/mpeg/dvbpsi_compat.h libdvb_plugin_la_SOURCES += mux/mpeg/dvbpsi_compat.h
access_LTLIBRARIES += libdvb_plugin.la access_LTLIBRARIES += libdvb_plugin.la
libdvb_plugin_la_CFLAGS += $(DVBPSI_CFLAGS) libdvb_plugin_la_CFLAGS += $(DVBPSI_CFLAGS)
libdvb_plugin_la_LIBADD = $(DVBPSI_LIBS) libdvb_plugin_la_LIBADD = $(DVBPSI_LIBS)
endif endif
endif endif
libaccess_eyetv_plugin_la_SOURCES = eyetv.m libaccess_eyetv_plugin_la_SOURCES = access/eyetv.m
libaccess_eyetv_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' \ libaccess_eyetv_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' \
-Wl,-framework,Foundation -Wl,-framework,Foundation
access_LTLIBRARIES += $(LTLIBaccess_eyetv) access_LTLIBRARIES += $(LTLIBaccess_eyetv)
...@@ -329,18 +327,18 @@ EXTRA_LTLIBRARIES += libaccess_eyetv_plugin.la ...@@ -329,18 +327,18 @@ EXTRA_LTLIBRARIES += libaccess_eyetv_plugin.la
### Network streams ### ### Network streams ###
libftp_plugin_la_SOURCES = ftp.c libftp_plugin_la_SOURCES = access/ftp.c
libftp_plugin_la_LIBADD = $(SOCKET_LIBS) libftp_plugin_la_LIBADD = $(SOCKET_LIBS)
access_LTLIBRARIES += libftp_plugin.la access_LTLIBRARIES += libftp_plugin.la
libhttp_plugin_la_SOURCES = http.c libhttp_plugin_la_SOURCES = access/http.c
libhttp_plugin_la_LIBADD = $(SOCKET_LIBS) libhttp_plugin_la_LIBADD = $(SOCKET_LIBS)
if HAVE_ZLIB if HAVE_ZLIB
libhttp_plugin_la_LIBADD += -lz libhttp_plugin_la_LIBADD += -lz
endif endif
access_LTLIBRARIES += libhttp_plugin.la access_LTLIBRARIES += libhttp_plugin.la
liblive555_plugin_la_SOURCES = live555.cpp mms/asf.c mms/buffer.c liblive555_plugin_la_SOURCES = access/live555.cpp access/mms/asf.c access/mms/buffer.c
liblive555_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS_live555) liblive555_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS_live555)
liblive555_plugin_la_LIBADD = $(LIBS_live555) liblive555_plugin_la_LIBADD = $(LIBS_live555)
liblive555_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' \ liblive555_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' \
...@@ -349,17 +347,17 @@ access_LTLIBRARIES += $(LTLIBlive555) ...@@ -349,17 +347,17 @@ access_LTLIBRARIES += $(LTLIBlive555)
EXTRA_LTLIBRARIES += liblive555_plugin.la EXTRA_LTLIBRARIES += liblive555_plugin.la
libaccess_mms_plugin_la_SOURCES = \ libaccess_mms_plugin_la_SOURCES = \
mms/mms.c mms/mms.h \ access/mms/mms.c access/mms/mms.h \
mms/mmsh.c mms/mmsh.h \ access/mms/mmsh.c access/mms/mmsh.h \
mms/mmstu.c mms/mmstu.h \ access/mms/mmstu.c access/mms/mmstu.h \
mms/buffer.c mms/buffer.h \ access/mms/buffer.c access/mms/buffer.h \
mms/asf.h mms/asf.c \ access/mms/asf.h access/mms/asf.c \
../demux/asf/libasf_guid.h demux/asf/libasf_guid.h
libaccess_mms_plugin_la_CFLAGS = $(AM_CFLAGS) libaccess_mms_plugin_la_CFLAGS = $(AM_CFLAGS)
libaccess_mms_plugin_la_LIBADD = $(SOCKET_LIBS) libaccess_mms_plugin_la_LIBADD = $(SOCKET_LIBS)
access_LTLIBRARIES += libaccess_mms_plugin.la access_LTLIBRARIES += libaccess_mms_plugin.la
libsmb_plugin_la_SOURCES = smb.c libsmb_plugin_la_SOURCES = access/smb.c
libsmb_plugin_la_CFLAGS = $(AM_CFLAGS) $(SMBCLIENT_CFLAGS) libsmb_plugin_la_CFLAGS = $(AM_CFLAGS) $(SMBCLIENT_CFLAGS)
libsmb_plugin_la_LIBADD = $(SMBCLIENT_LIBS) libsmb_plugin_la_LIBADD = $(SMBCLIENT_LIBS)
if HAVE_WIN32 if HAVE_WIN32
...@@ -369,15 +367,15 @@ libsmb_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' ...@@ -369,15 +367,15 @@ libsmb_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
access_LTLIBRARIES += $(LTLIBsmb) access_LTLIBRARIES += $(LTLIBsmb)
EXTRA_LTLIBRARIES += libsmb_plugin.la EXTRA_LTLIBRARIES += libsmb_plugin.la
libtcp_plugin_la_SOURCES = tcp.c libtcp_plugin_la_SOURCES = access/tcp.c
libtcp_plugin_la_LIBADD = $(SOCKET_LIBS) libtcp_plugin_la_LIBADD = $(SOCKET_LIBS)
access_LTLIBRARIES += libtcp_plugin.la access_LTLIBRARIES += libtcp_plugin.la
libudp_plugin_la_SOURCES = udp.c libudp_plugin_la_SOURCES = access/udp.c
libudp_plugin_la_LIBADD = $(SOCKET_LIBS) libudp_plugin_la_LIBADD = $(SOCKET_LIBS)
access_LTLIBRARIES += libudp_plugin.la access_LTLIBRARIES += libudp_plugin.la
libsftp_plugin_la_SOURCES = sftp.c libsftp_plugin_la_SOURCES = access/sftp.c
libsftp_plugin_la_CFLAGS = $(AM_CFLAGS) $(SFTP_CFLAGS) libsftp_plugin_la_CFLAGS = $(AM_CFLAGS) $(SFTP_CFLAGS)
libsftp_plugin_la_LIBADD = $(SFTP_LIBS) libsftp_plugin_la_LIBADD = $(SFTP_LIBS)
libsftp_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' libsftp_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
...@@ -385,18 +383,18 @@ access_LTLIBRARIES += $(LTLIBsftp) ...@@ -385,18 +383,18 @@ access_LTLIBRARIES += $(LTLIBsftp)
EXTRA_LTLIBRARIES += libsftp_plugin.la EXTRA_LTLIBRARIES += libsftp_plugin.la
libaccess_realrtsp_plugin_la_SOURCES = \ libaccess_realrtsp_plugin_la_SOURCES = \
rtsp/access.c \ access/rtsp/access.c \
rtsp/rtsp.c rtsp/rtsp.h \ access/rtsp/rtsp.c access/rtsp/rtsp.h \
rtsp/real.c rtsp/real.h \ access/rtsp/real.c access/rtsp/real.h \
rtsp/real_rmff.c rtsp/real_rmff.h \ access/rtsp/real_rmff.c access/rtsp/real_rmff.h \
rtsp/real_sdpplin.c rtsp/real_sdpplin.h \ access/rtsp/real_sdpplin.c access/rtsp/real_sdpplin.h \
rtsp/real_asmrp.c access/rtsp/real_asmrp.c
libaccess_realrtsp_plugin_la_LIBADD = $(SOCKET_LIBS) libaccess_realrtsp_plugin_la_LIBADD = $(SOCKET_LIBS)
libaccess_realrtsp_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' libaccess_realrtsp_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
access_LTLIBRARIES += $(LTLIBaccess_realrtsp) access_LTLIBRARIES += $(LTLIBaccess_realrtsp)
EXTRA_LTLIBRARIES += libaccess_realrtsp_plugin.la EXTRA_LTLIBRARIES += libaccess_realrtsp_plugin.la
libavio_plugin_la_SOURCES = avio.c avio.h ../codec/avcodec/cpu.c libavio_plugin_la_SOURCES = access/avio.c access/avio.h codec/avcodec/cpu.c
libavio_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) libavio_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS)
libavio_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(SYMBOLIC_LDFLAGS) libavio_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(SYMBOLIC_LDFLAGS)
libavio_plugin_la_LIBADD = $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(LIBM) libavio_plugin_la_LIBADD = $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(LIBM)
...@@ -407,14 +405,14 @@ endif ...@@ -407,14 +405,14 @@ endif
### Misc ### ### Misc ###
libgnomevfs_plugin_la_SOURCES = gnomevfs.c libgnomevfs_plugin_la_SOURCES = access/gnomevfs.c
libgnomevfs_plugin_la_CFLAGS = $(AM_CFLAGS) $(GNOMEVFS_CFLAGS) libgnomevfs_plugin_la_CFLAGS = $(AM_CFLAGS) $(GNOMEVFS_CFLAGS)
libgnomevfs_plugin_la_LIBADD = $(GNOMEVFS_LIBS) libgnomevfs_plugin_la_LIBADD = $(GNOMEVFS_LIBS)
libgnomevfs_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' libgnomevfs_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
access_LTLIBRARIES += $(LTLIBgnomevfs) access_LTLIBRARIES += $(LTLIBgnomevfs)
EXTRA_LTLIBRARIES += libgnomevfs_plugin.la EXTRA_LTLIBRARIES += libgnomevfs_plugin.la
libaccess_mtp_plugin_la_SOURCES = mtp.c libaccess_mtp_plugin_la_SOURCES = access/mtp.c
libaccess_mtp_plugin_la_CFLAGS = $(AM_CFLAGS) $(MTP_CFLAGS) libaccess_mtp_plugin_la_CFLAGS = $(AM_CFLAGS) $(MTP_CFLAGS)
libaccess_mtp_plugin_la_LIBADD = $(MTP_LIBS) libaccess_mtp_plugin_la_LIBADD = $(MTP_LIBS)
libaccess_mtp_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' libaccess_mtp_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment