Skip to content

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

modules: use different directory prefixes for each plugins subdirectory 

This is just a step toward less recursion.
parent 59b95f35
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 245 additions and 250 deletions
modules/access/Makefile.am
View file @ e67cf044
This diff is collapsed.
modules/access/rtp/Makefile.am
View file @ e67cf044
basedir = access
include $(top_srcdir)/modules/common.am
accessdir = $(pluginsdir)/access
# RTP plugin
libvlc_LTLIBRARIES = librtp_plugin.la
access_LTLIBRARIES = librtp_plugin.la
librtp_plugin_la_SOURCES = \
rtp.c \
rtp.h \
......
modules/access_output/Modules.am
View file @ e67cf044
......@@ -4,7 +4,7 @@ SOURCES_access_output_udp = udp.c
SOURCES_access_output_http = http.c bonjour.c bonjour.h
SOURCES_access_output_shout = shout.c
libvlc_LTLIBRARIES += \
access_output_LTLIBRARIES += \
libaccess_output_dummy_plugin.la \
libaccess_output_file_plugin.la \
libaccess_output_udp_plugin.la \
......@@ -18,5 +18,5 @@ libaccess_output_livehttp_plugin_la_LIBADD = $(AM_LIBADD) $(GCRYPT_LIBS) -lgpg-e
if HAVE_WIN32
libaccess_output_livehttp_plugin_la_DEPENDENCIES = libaccess_output_livehttp_plugin.rc.o
endif
libvlc_LTLIBRARIES += libaccess_output_livehttp_plugin.la
access_output_LTLIBRARIES += libaccess_output_livehttp_plugin.la
endif
modules/arm_neon/Makefile.am
View file @ e67cf044
basedir = arm_neon
include $(top_srcdir)/modules/common.am
AM_LIBTOOLFLAGS=--tag=CC
include $(top_srcdir)/modules/common.am
neondir = $(pluginsdir)/arm_neon
libsimple_channel_mixer_neon_plugin_la_SOURCES = \
simple_channel_mixer.S \
......@@ -31,7 +30,7 @@ libyuv_rgb_neon_plugin_la_SOURCES = \
libyuv_rgb_neon_plugin_la_CFLAGS = $(AM_CFLAGS)
libyuv_rgb_neon_plugin_la_LIBADD = $(AM_LIBADD)
libvlc_LTLIBRARIES = \
neon_LTLIBRARIES = \
libsimple_channel_mixer_neon_plugin.la \
libchroma_yuv_neon_plugin.la \
libvolume_neon_plugin.la \
......
modules/audio_filter/Modules.am
View file @ e67cf044
......@@ -16,7 +16,7 @@ SOURCES_spatializer = \
spatializer/revmodel.cpp spatializer/revmodel.hpp \
spatializer/spatializer.cpp
libvlc_LTLIBRARIES += \
audio_filter_LTLIBRARIES += \
libaudiobargraph_a_plugin.la \
libchorus_flanger_plugin.la \
libcompressor_plugin.la \
......@@ -37,7 +37,7 @@ SOURCES_dolby_surround_decoder = channel_mixer/dolby.c
SOURCES_mono = channel_mixer/mono.c
SOURCES_remap = channel_mixer/remap.c
libvlc_LTLIBRARIES += \
audio_filter_LTLIBRARIES += \
libdolby_surround_decoder_plugin.la \
libheadphone_channel_mixer_plugin.la \
libmono_plugin.la \
......@@ -58,7 +58,7 @@ if HAVE_WIN32
libaudio_format_plugin_la_DEPENDENCIES = libaudio_format_plugin.rc.o
endif
libvlc_LTLIBRARIES += \
audio_filter_LTLIBRARIES += \
liba52tospdif_plugin.la \
libaudio_format_plugin.la \
libdtstospdif_plugin.la
......@@ -69,7 +69,7 @@ SOURCES_bandlimited_resampler = \
SOURCES_ugly_resampler = resampler/ugly.c
SOURCES_samplerate = resampler/src.c
libvlc_LTLIBRARIES += \
audio_filter_LTLIBRARIES += \
libugly_resampler_plugin.la
EXTRA_LTLIBRARIES += \
libbandlimited_resampler_plugin.la
......@@ -81,5 +81,5 @@ if HAVE_WIN32
libspeex_resampler_plugin_la_DEPENDENCIES = libspeex_resampler_plugin.rc.o
endif
if HAVE_SPEEXDSP
libvlc_LTLIBRARIES += libspeex_resampler_plugin.la
audio_filter_LTLIBRARIES += libspeex_resampler_plugin.la
endif
modules/audio_mixer/Makefile.am
View file @ e67cf044
basedir = audio_mixer
include $(top_srcdir)/modules/common.am
audio_mixerdir = $(pluginsdir)/audio_mixer
libfloat_mixer_plugin_la_SOURCES = float.c
libfloat_mixer_plugin_la_CFLAGS = $(AM_CFLAGS)
......@@ -15,6 +15,6 @@ if HAVE_WIN32
libinteger_mixer_plugin_la_DEPENDENCIES = libinteger_mixer_plugin.rc.o
endif
libvlc_LTLIBRARIES = \
audio_mixer_LTLIBRARIES = \
libfloat_mixer_plugin.la \
libinteger_mixer_plugin.la
modules/audio_output/Modules.am
View file @ e67cf044
aoutdir = $(pluginsdir)/audio_output
aout_LTLIBRARIES =
SOURCES_waveout = waveout.c windows_audio_common.h
SOURCES_auhal = TPCircularBuffer.h TPCircularBuffer.c auhal.c
SOURCES_audiounit_ios = TPCircularBuffer.h TPCircularBuffer.c audiounit_ios.c
......@@ -12,7 +15,7 @@ libandroid_audiotrack_plugin_la_CFLAGS = $(AM_CFLAGS)
libandroid_audiotrack_plugin_la_LIBADD = $(AM_LIBADD) -ldl
if HAVE_ANDROID
libvlc_LTLIBRARIES += libandroid_audiotrack_plugin.la libopensles_android_plugin.la
aout_LTLIBRARIES += libandroid_audiotrack_plugin.la libopensles_android_plugin.la
endif
libadummy_plugin_la_SOURCES = adummy.c
......@@ -36,7 +39,7 @@ if HAVE_WIN32
libamem_plugin_la_DEPENDENCIES = libamem_plugin.rc.o
endif
libvlc_LTLIBRARIES += \
aout_LTLIBRARIES += \
libadummy_plugin.la \
libafile_plugin.la \
libamem_plugin.la
......@@ -45,14 +48,14 @@ liboss_plugin_la_SOURCES = oss.c volume.h
liboss_plugin_la_CFLAGS = $(AM_CFLAGS)
liboss_plugin_la_LIBADD = $(AM_LIBADD) $(OSS_LIBS) $(LIBM)
if HAVE_OSS
libvlc_LTLIBRARIES += liboss_plugin.la
aout_LTLIBRARIES += liboss_plugin.la
endif
libalsa_plugin_la_SOURCES = alsa.c volume.h
libalsa_plugin_la_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS)
libalsa_plugin_la_LIBADD = $(AM_LIBADD) $(ALSA_LIBS) $(LIBM)
if HAVE_ALSA
libvlc_LTLIBRARIES += libalsa_plugin.la
aout_LTLIBRARIES += libalsa_plugin.la
endif
libpulse_plugin_la_SOURCES = pulse.c
......@@ -60,14 +63,14 @@ libpulse_plugin_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS)
libpulse_plugin_la_LIBADD = ../libvlc_pulse.la \
$(AM_LIBADD) $(PULSE_LIBS) $(LIBM)
if HAVE_PULSE
libvlc_LTLIBRARIES += libpulse_plugin.la
aout_LTLIBRARIES += libpulse_plugin.la
endif
libjack_plugin_la_SOURCES = jack.c volume.h
libjack_plugin_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS)
libjack_plugin_la_LIBADD = $(AM_LIBADD) $(JACK_LIBS) $(LIBM)
if HAVE_JACK
libvlc_LTLIBRARIES += libjack_plugin.la
aout_LTLIBRARIES += libjack_plugin.la
endif
libmmdevice_plugin_la_SOURCES = mmdevice.c mmdevice.h wasapi.c
......@@ -77,7 +80,7 @@ if HAVE_WIN32
libmmdevice_plugin_la_DEPENDENCIES = libmmdevice_plugin.rc.o
endif
if HAVE_WASAPI
libvlc_LTLIBRARIES += libmmdevice_plugin.la
aout_LTLIBRARIES += libmmdevice_plugin.la
endif
libdirectsound_plugin_la_SOURCES = directx.c windows_audio_common.h
......@@ -87,19 +90,19 @@ if HAVE_WIN32
libdirectsound_plugin_la_DEPENDENCIES = libdirectsound_plugin.rc.o
endif
if HAVE_DIRECTX
libvlc_LTLIBRARIES += libdirectsound_plugin.la
aout_LTLIBRARIES += libdirectsound_plugin.la
endif
libkai_plugin_la_SOURCES = kai.c
libkai_plugin_la_CFLAGS = $(AM_CFLAGS)
libkai_plugin_la_LIBADD = $(AM_LIBADD) $(KAI_LIBS)
if HAVE_KAI
libvlc_LTLIBRARIES += libkai_plugin.la
aout_LTLIBRARIES += libkai_plugin.la
endif
libsndio_plugin_la_SOURCES = sndio.c
libsndio_plugin_la_CFLAGS = $(AM_CFLAGS)
libsndio_plugin_la_LIBADD = $(AM_LIBADD) -lsndio
if HAVE_SNDIO
libvlc_LTLIBRARIES += libsndio_plugin.la
aout_LTLIBRARIES += libsndio_plugin.la
endif
modules/codec/Modules.am
View file @ e67cf044
......@@ -52,7 +52,7 @@ SOURCES_fdkaac = fdkaac.c
SOURCES_scte27 = scte27.c
SOURCES_qsv = qsv.c
libvlc_LTLIBRARIES += \
codec_LTLIBRARIES += \
libcc_plugin.la \
libcdg_plugin.la \
libcvdsub_plugin.la \
......@@ -68,7 +68,7 @@ libvlc_LTLIBRARIES += \
$(NULL)
if ENABLE_SOUT
libvlc_LTLIBRARIES += \
codec_LTLIBRARIES += \
libt140_plugin.la \
libedummy_plugin.la
endif
......@@ -107,7 +107,7 @@ libmpeg_audio_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
libuleaddvaudio_plugin_la_SOURCES = uleaddvaudio.c
libuleaddvaudio_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
libvlc_LTLIBRARIES += \
codec_LTLIBRARIES += \
liba52_plugin.la \
libadpcm_plugin.la \
libaes3_plugin.la \
......@@ -153,7 +153,7 @@ endif
libavcodec_plugin_la_CFLAGS += -DMERGE_FFMPEG
endif
if HAVE_AVCODEC
libvlc_LTLIBRARIES += libavcodec_plugin.la
codec_LTLIBRARIES += libavcodec_plugin.la
endif
### avcodec hardware acceleration ###
......@@ -166,7 +166,7 @@ libvaapi_plugin_la_CFLAGS = $(AM_CFLAGS) \
libvaapi_plugin_la_LIBADD = $(AM_LIBADD) \
$(LIBVA_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
if HAVE_AVCODEC_VAAPI
libvlc_LTLIBRARIES += libvaapi_plugin.la
codec_LTLIBRARIES += libvaapi_plugin.la
endif
libdxva2_plugin_la_SOURCES = \
......@@ -174,7 +174,7 @@ libdxva2_plugin_la_SOURCES = \
avcodec/dxva2.c
libdxva2_plugin_la_LIBADD = $(AM_LIBADD) -lole32 -lshlwapi -luuid
if HAVE_AVCODEC_DXVA2
libvlc_LTLIBRARIES += libdxva2_plugin.la
codec_LTLIBRARIES += libdxva2_plugin.la
endif
libdxva2_plugin_la_DEPENDENCIES = libdxva2_plugin.rc.o
......@@ -184,7 +184,7 @@ libvda_plugin_la_SOURCES = \
libvda_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVCODEC_CFLAGS)
libvda_plugin_la_LDFLAGS = -Wl,-framework,CoreFoundation,-framework,VideoDecodeAcceleration,-framework,QuartzCore
if HAVE_AVCODEC_VDA
libvlc_LTLIBRARIES += libvda_plugin.la
codec_LTLIBRARIES += libvda_plugin.la
endif
libhwdummy_plugin_la_SOURCES = avcodec/hwdummy.c
......@@ -192,7 +192,7 @@ libhwdummy_plugin_la_CFLAGS = $(AM_CFLAGS) $(VDPAU_CFLAGS) $(AVCODEC_CFLAGS)
libhwdummy_plugin_la_LIBADD = $(AM_LIBADD) $(AVCODEC_LIBS)
# FIXME: hwdummy only needs libavutil, and only if avcodec < 55.13.0
if HAVE_AVCODEC_VDPAU
libvlc_LTLIBRARIES += libhwdummy_plugin.la
codec_LTLIBRARIES += libhwdummy_plugin.la
endif
if HAVE_WIN32
libhwdummy_plugin_la_DEPENDENCIES = libhwdummy_plugin.rc.o
......@@ -202,10 +202,8 @@ endif
libxwd_plugin_la_SOURCES = xwd.c
libxwd_plugin_la_CFLAGS = $(AM_CFLAGS) $(XPROTO_CFLAGS)
libxwd_plugin_la_LIBADD = $(AM_LIBADD) $(XPROTO_LIBS)
if HAVE_WIN32
libxwd_plugin_la_DEPENDENCIES = libxwd_plugin.rc.o
endif
libvlc_LTLIBRARIES += $(LTLIBxwd)
libxwd_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
codec_LTLIBRARIES += $(LTLIBxwd)
EXTRA_LTLIBRARIES += libxwd_plugin.la
### OpenMAX ###
......@@ -228,10 +226,12 @@ libomxil_plugin_la_SOURCES = \
omxil/omxil.c omxil/omxil.h omxil/omxil_core.c omxil/omxil_core.h
libomxil_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/omxil $(CFLAGS_omxil)
libomxil_plugin_la_LIBADD = $(AM_LIBADD) $(LIBDL)
libomxil_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
libomxil_vout_plugin_la_SOURCES = omxil/vout.c omxil/omxil_core.c omxil/utils.c omxil/qcom.c
libomxil_vout_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/omxil $(CFLAGS_omxil_vout)
libomxil_vout_plugin_la_LIBADD = $(AM_LIBADD) $(LIBDL)
libomxil_vout_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
libiomx_plugin_la_SOURCES = $(libomxil_plugin_la_SOURCES)
libiomx_plugin_la_CPPFLAGS = $(libomxil_plugin_la_CPPFLAGS) -DUSE_IOMX
......@@ -240,9 +240,8 @@ libiomx_plugin_la_LIBADD = $(libomxil_plugin_la_LIBADD)
libmediacodec_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/omxil
libmediacodec_plugin_la_SOURCES = omxil/android_mediacodec.c omxil/utils.c
libvlc_LTLIBRARIES += $(LTLIBomxil) $(LTLIBomxil_vout)
codec_LTLIBRARIES += $(LTLIBomxil) $(LTLIBomxil_vout)
EXTRA_LTLIBRARIES += libomxil_plugin.la libomxil_vout_plugin.la
if HAVE_ANDROID
libvlc_LTLIBRARIES += libiomx_plugin.la libmediacodec_plugin.la
codec_LTLIBRARIES += libiomx_plugin.la libmediacodec_plugin.la
endif
modules/common.am
View file @ e67cf044
......@@ -8,7 +8,7 @@
AUTOMAKE_OPTIONS = subdir-objects
NULL =
libvlcdir = $(vlclibdir)/plugins/$(basedir)
pluginsdir = $(vlclibdir)/plugins
BUILT_SOURCES =
CLEANFILES = $(BUILT_SOURCES)
......@@ -29,7 +29,7 @@ AM_CFLAGS =
AM_CXXFLAGS =
AM_OBJCFLAGS =
AM_LIBADD = $(LIBPTHREAD)
AM_LDFLAGS = -rpath '$(libvlcdir)' \
AM_LDFLAGS = \
-avoid-version -module \
-export-symbols-regex ^vlc_entry \
-shrext $(LIBEXT) \
......
modules/control/Modules.am
View file @ e67cf044
......@@ -17,7 +17,7 @@ SOURCES_motion = \
$(motion_extra) \
$(NULL)
libvlc_LTLIBRARIES += \
control_LTLIBRARIES += \
libdummy_plugin.la \
libgestures_plugin.la \
libnetsync_plugin.la \
......@@ -25,9 +25,9 @@ libvlc_LTLIBRARIES += \
liboldrc_plugin.la
if HAVE_WIN32
libvlc_LTLIBRARIES += libntservice_plugin.la
control_LTLIBRARIES += libntservice_plugin.la
else
libvlc_LTLIBRARIES += libmotion_plugin.la
control_LTLIBRARIES += libmotion_plugin.la
endif
libdbus_plugin_la_SOURCES = \
......@@ -39,19 +39,20 @@ libdbus_plugin_la_SOURCES = \
libdbus_plugin_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
libdbus_plugin_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) $(LIBM)
if HAVE_DBUS
libvlc_LTLIBRARIES += libdbus_plugin.la
control_LTLIBRARIES += libdbus_plugin.la
endif
libxcb_hotkeys_plugin_la_SOURCES = globalhotkeys/xcb.c
libxcb_hotkeys_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(XCB_KEYSYMS_CFLAGS) $(XCB_CFLAGS)
libxcb_hotkeys_plugin_la_LIBADD = $(AM_LIBADD) $(XCB_KEYSYMS_LIBS) $(XCB_LIBS)
libxcb_hotkeys_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(controldir)'
EXTRA_LTLIBRARIES += libxcb_hotkeys_plugin.la
libvlc_LTLIBRARIES += $(LTLIBxcb_hotkeys)
control_LTLIBRARIES += $(LTLIBxcb_hotkeys)
libwin_hotkeys_plugin_la_SOURCES = globalhotkeys/win32.c
libwin_hotkeys_plugin_la_CFLAGS = $(AM_CFLAGS)
libwin_hotkeys_plugin_la_LIBADD = $(AM_LIBADD)
if HAVE_WIN32
libvlc_LTLIBRARIES += libwin_hotkeys_plugin.la
control_LTLIBRARIES += libwin_hotkeys_plugin.la
endif
modules/demux/Modules.am
View file @ e67cf044
......@@ -70,7 +70,7 @@ if HAVE_WIN32
libavformat_plugin_la_DEPENDENCIES = libavformat_plugin.rc.o
endif
if HAVE_AVFORMAT
libvlc_LTLIBRARIES += libavformat_plugin.la
demux_LTLIBRARIES += libavformat_plugin.la
endif
libes_plugin_la_SOURCES = mpeg/es.c
......@@ -100,15 +100,12 @@ libmkv_plugin_la_SOURCES = \
mp4/libmp4.c vobsub.h \
mkv/mkv.hpp mkv/mkv.cpp
libmkv_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
libmkv_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)'
libmkv_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_mkv)
libmkv_plugin_la_LDFLAGS = $(AM_LDFLAGS)
if HAVE_ZLIB
libmkv_plugin_la_LIBADD += -lz
endif
if HAVE_WIN32
libmkv_plugin_la_DEPENDENCIES = libmkv_plugin.rc.o
endif
libvlc_LTLIBRARIES += $(LTLIBmkv)
demux_LTLIBRARIES += $(LTLIBmkv)
EXTRA_LTLIBRARIES += libmkv_plugin.la
libmp4_plugin_la_SOURCES = mp4/mp4.c mp4/libmp4.c mp4/libmp4.h mp4/id3genres.h
......@@ -161,10 +158,10 @@ if HAVE_WIN32
libts_plugin_la_DEPENDENCIES = libts_plugin.rc.o
endif
if HAVE_DVBPSI
libvlc_LTLIBRARIES += libts_plugin.la
demux_LTLIBRARIES += libts_plugin.la
endif
libvlc_LTLIBRARIES += \
demux_LTLIBRARIES += \
libaiff_plugin.la \
libasf_plugin.la \
libau_plugin.la \
......
modules/genmf
View file @ e67cf044
......@@ -21,26 +21,13 @@ do
basedir="`echo "${dir}" | cut -f1 -d/`"
mods="`sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < "${modf}" | sort | uniq | xargs`"
plugins="`sed -n -e 's/^.*lib\([^ ]*\)_plugin\.la.*/\1/p' < "${modf}" | sort | uniq | xargs`"
libvlc_ltlibs=""
extra_ltlibs=""
for mod in $mods
do
case " ${plugins} " in
*\ ${mod}\ *)
;;
*)
libvlc_ltlibs="${libvlc_ltlibs} \$(LTLIB${mod})"
extra_ltlibs="${extra_ltlibs} lib${mod}_plugin.la"
;;
esac
done
rm -f "${makf}" && cat > "${makf}" << EOF
# ${makf} automatically generated from ${modf} by $0
# DO NOT EDIT THIS FILE DIRECTLY! See Modules.am instead.
basedir = ${basedir}
libvlc_LTLIBRARIES = ${libvlc_ltlibs}
EXTRA_LTLIBRARIES = ${extra_ltlibs}
${basedir}dir = \$(pluginsdir)/${basedir}
${basedir}_LTLIBRARIES =
EXTRA_LTLIBRARIES =
EXTRA_DIST = Modules.am
......@@ -62,8 +49,18 @@ lib${mod}_plugin_la_CFLAGS = \$(AM_CFLAGS) \$(CFLAGS_${mod})
lib${mod}_plugin_la_CXXFLAGS = \$(AM_CXXFLAGS) \$(CXXFLAGS_${mod})
lib${mod}_plugin_la_OBJCFLAGS = \$(AM_OBJCFLAGS) \$(OBJCFLAGS_${mod})
lib${mod}_plugin_la_LIBADD = \$(AM_LIBADD) \$(LIBS_${mod})
lib${mod}_plugin_la_LDFLAGS = \$(AM_LDFLAGS) \$(LDFLAGS_${mod})
lib${mod}_plugin_la_LDFLAGS = \$(AM_LDFLAGS) -rpath '\$(${basedir}dir)' \$(LDFLAGS_${mod})
EOF
case " ${plugins} " in
*\ ${mod}\ *)
;;
*)
cat >> "${makf}" << EOF
EXTRA_LTLIBRARIES += lib${mod}_plugin.la
${basedir}_LTLIBRARIES += \$(LTLIB${mod})
EOF
;;
esac
done
shift
......
modules/gui/qt4/Makefile.am
View file @ e67cf044
basedir = gui
include $(top_srcdir)/modules/common.am
guidir = $(pluginsdir)/gui
## Howto
# For each Q_OBJECT:
......@@ -17,7 +16,7 @@ SUFFIXES = .ui .h .hpp .moc.cpp
libqt4_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS)
libqt4_plugin_la_LIBADD = $(AM_LIBADD) $(QT_LIBS)
libqt4_plugin_la_LDFLAGS = $(AM_LDFLAGS)
libqt4_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)'
if HAVE_OS2
else
if HAVE_WIN32
......@@ -31,7 +30,7 @@ if HAVE_DARWIN
libqt4_plugin_la_LDFLAGS += -Wl,-framework,Cocoa
endif
libvlc_LTLIBRARIES = $(LTLIBqt4)
gui_LTLIBRARIES = $(LTLIBqt4)
EXTRA_LTLIBRARIES = libqt4_plugin.la
libqt4_plugin_la_SOURCES = \
......
modules/hw/vdpau/Makefile.am
View file @ e67cf044
basedir = vdpau
include $(top_srcdir)/modules/common.am
vdpaudir = $(pluginsdir)/vdpau
AM_CFLAGS += $(VDPAU_CFLAGS)
AM_LIBADD += libvlc_vdpau.la
......@@ -14,7 +14,7 @@ libvlc_vdpau_la_LDFLAGS = \
-version-info 0:0:0
pkglib_LTLIBRARIES = libvlc_vdpau.la
libvlc_LTLIBRARIES =
vdpau_LTLIBRARIES =
libvdpau_avcodec_plugin_la_SOURCES = avcodec.c picture.c
libvdpau_avcodec_plugin_la_CFLAGS = $(AM_CFLAGS) \
......@@ -23,28 +23,28 @@ libvdpau_avcodec_plugin_la_LIBADD = $(AM_LIBADD) \
$(X_LIBS) $(X_PRE_LIBS) -lX11 $(AVCODEC_LIBS)
# FIXME: hwdummy only needs libavutil, and only if avcodec < 55.13.0
if HAVE_AVCODEC_VDPAU
libvlc_LTLIBRARIES += libvdpau_avcodec_plugin.la
vdpau_LTLIBRARIES += libvdpau_avcodec_plugin.la
endif
libvdpau_deinterlace_plugin_la_SOURCES = deinterlace.c picture.c
libvdpau_deinterlace_plugin_la_CFLAGS = $(AM_CFLAGS) # dummy
libvdpau_deinterlace_plugin_la_LIBADD = $(AM_LIBADD)
libvlc_LTLIBRARIES += libvdpau_deinterlace_plugin.la
vdpau_LTLIBRARIES += libvdpau_deinterlace_plugin.la
libvdpau_adjust_plugin_la_SOURCES = adjust.c picture.c
libvdpau_adjust_plugin_la_CFLAGS = $(AM_CFLAGS) # dummy
libvdpau_adjust_plugin_la_LIBADD = $(AM_LIBADD)
libvlc_LTLIBRARIES += libvdpau_adjust_plugin.la
vdpau_LTLIBRARIES += libvdpau_adjust_plugin.la
libvdpau_sharpen_plugin_la_SOURCES = sharpen.c picture.c
libvdpau_sharpen_plugin_la_CFLAGS = $(AM_CFLAGS) # dummy
libvdpau_sharpen_plugin_la_LIBADD = $(AM_LIBADD)
libvlc_LTLIBRARIES += libvdpau_sharpen_plugin.la
vdpau_LTLIBRARIES += libvdpau_sharpen_plugin.la
libvdpau_chroma_plugin_la_SOURCES = chroma.c picture.c
libvdpau_chroma_plugin_la_CFLAGS = $(AM_CFLAGS) # dummy
libvdpau_chroma_plugin_la_LIBADD = $(AM_LIBADD)
libvlc_LTLIBRARIES += libvdpau_chroma_plugin.la
vdpau_LTLIBRARIES += libvdpau_chroma_plugin.la
libvdpau_display_plugin_la_SOURCES = display.c
libvdpau_display_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
......@@ -54,4 +54,4 @@ libvdpau_display_plugin_la_CFLAGS = $(AM_CFLAGS) \
libvdpau_display_plugin_la_LIBADD = \
../../video_output/libvlc_xcb_events.la \
$(AM_LIBADD) $(X_LIBS) $(X_PRE_LIBS) -lX11 $(XCB_LIBS)
libvlc_LTLIBRARIES += libvdpau_display_plugin.la
vdpau_LTLIBRARIES += libvdpau_display_plugin.la
modules/lua/Modules.am
View file @ e67cf044
......@@ -40,4 +40,4 @@ if HAVE_WIN32
SOURCES_lua += libs/win.c
endif
libvlc_LTLIBRARIES += liblua_plugin.la
lua_LTLIBRARIES += liblua_plugin.la
modules/meta_engine/Modules.am
View file @ e67cf044
SOURCES_folder = folder.c
SOURCES_taglib = taglib.cpp ../demux/xiph_metadata.h ../demux/xiph_metadata.c
libvlc_LTLIBRARIES += \
meta_engine_LTLIBRARIES += \
libfolder_plugin.la
modules/misc/Modules.am
View file @ e67cf044
......@@ -18,23 +18,23 @@ libexport_plugin_la_LIBADD = $(AM_LIBADD)
if HAVE_WIN32
libexport_plugin_la_DEPENDENCIES = libexport_plugin.rc.o
endif
libvlc_LTLIBRARIES += libexport_plugin.la
misc_LTLIBRARIES += libexport_plugin.la
libgnutls_plugin_la_SOURCES = gnutls.c dhparams.h
libgnutls_plugin_la_CFLAGS = $(AM_CFLAGS) $(GNUTLS_CFLAGS)
libgnutls_plugin_la_LIBADD = $(AM_LIBADD) $(GNUTLS_LIBS)
if HAVE_WIN32
libgnutls_plugin_la_LIBADD += $(SOCKET_LIBS)
libgnutls_plugin_la_DEPENDENCIES = libgnutls_plugin.rc.o
endif
libgnutls_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(miscdir)'
EXTRA_LTLIBRARIES += libgnutls_plugin.la
libvlc_LTLIBRARIES += $(LTLIBgnutls)
misc_LTLIBRARIES += $(LTLIBgnutls)
libxdg_screensaver_plugin_la_SOURCES = inhibit/xdg.c
libxdg_screensaver_plugin_la_CFLAGS = $(AM_CFLAGS)
libxdg_screensaver_plugin_la_LIBADD = $(AM_LIBADD)
if HAVE_XCB
libvlc_LTLIBRARIES += \
misc_LTLIBRARIES += \
libxdg_screensaver_plugin.la
endif
......@@ -42,7 +42,7 @@ libdbus_screensaver_plugin_la_SOURCES = inhibit/dbus.c
libdbus_screensaver_plugin_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
libdbus_screensaver_plugin_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS)
if HAVE_DBUS
libvlc_LTLIBRARIES += libdbus_screensaver_plugin.la
misc_LTLIBRARIES += libdbus_screensaver_plugin.la
endif
liblogger_plugin_la_SOURCES = logger.c
......@@ -62,13 +62,13 @@ if HAVE_WIN32
libstats_plugin_la_DEPENDENCIES = libstats_plugin.rc.o
endif
libvlc_LTLIBRARIES += \
misc_LTLIBRARIES += \
libaudioscrobbler_plugin.la \
liblogger_plugin.la \
libstats_plugin.la
if ENABLE_SOUT
libvlc_LTLIBRARIES += \
misc_LTLIBRARIES += \
libvod_rtsp_plugin.la \
$(NULL)
endif
modules/mux/Modules.am
View file @ e67cf044
......@@ -6,7 +6,7 @@ SOURCES_mux_asf = asf.c ../demux/asf/libasf_guid.h
SOURCES_mux_wav = wav.c
SOURCES_mux_mpjpeg = mpjpeg.c
libvlc_LTLIBRARIES += \
mux_LTLIBRARIES += \
libmux_dummy_plugin.la \
libmux_avi_plugin.la \
libmux_mp4_plugin.la \
......@@ -23,7 +23,7 @@ libmux_ps_plugin_la_LIBADD = $(AM_LIBADD)
if HAVE_WIN32
libmux_ps_plugin_la_DEPENDENCIES = libmux_ps_plugin.rc.o
endif
libvlc_LTLIBRARIES += libmux_ps_plugin.la
mux_LTLIBRARIES += libmux_ps_plugin.la
libmux_ts_plugin_la_SOURCES = \
mpeg/pes.c mpeg/pes.h \
......@@ -35,5 +35,5 @@ if HAVE_WIN32
libmux_ts_plugin_la_DEPENDENCIES = libmux_ts_plugin.rc.o
endif
if HAVE_DVBPSI
libvlc_LTLIBRARIES += libmux_ts_plugin.la
mux_LTLIBRARIES += libmux_ts_plugin.la
endif
modules/notify/Makefile.am
View file @ e67cf044
basedir = notify
include $(top_srcdir)/modules/common.am
notifydir = $(pluginsdir)/notify
AM_LDFLAGS += -rpath '$(notifydir)'
libgrowl_plugin_la_SOURCES = growl.m
libgrowl_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) $(OBJCFLAGS_growl)
......@@ -11,5 +12,5 @@ libnotify_plugin_la_SOURCES = notify.c
libnotify_plugin_la_CFLAGS = $(AM_CFLAGS) $(NOTIFY_CFLAGS)
libnotify_plugin_la_LIBADD = $(AM_LIBADD) $(NOTIFY_LIBS)
libvlc_LTLIBRARIES = $(LTLIBgrowl) $(LTLIBnotify)
notify_LTLIBRARIES = $(LTLIBgrowl) $(LTLIBnotify)
EXTRA_LTLIBRARIES = libgrowl_plugin.la libnotify_plugin.la
modules/packetizer/Modules.am
View file @ e67cf044
......@@ -10,7 +10,7 @@ SOURCES_packetizer_flac = flac.c
noinst_HEADERS = packetizer_helper.h
libvlc_LTLIBRARIES += \
packetizer_LTLIBRARIES += \
libpacketizer_mpegvideo_plugin.la \
libpacketizer_mpeg4video_plugin.la \
libpacketizer_mpeg4audio_plugin.la \
......@@ -21,5 +21,5 @@ libvlc_LTLIBRARIES += \
libpacketizer_flac_plugin.la \
$(NULL)
if ENABLE_SOUT
libvlc_LTLIBRARIES += libpacketizer_copy_plugin.la
packetizer_LTLIBRARIES += libpacketizer_copy_plugin.la
endif
modules/services_discovery/Modules.am
View file @ e67cf044
sddir = $(pluginsdir)/services_discovery
sd_LTLIBRARIES =
SOURCES_upnp = upnp.cpp upnp.hpp
SOURCES_bonjour = bonjour.c
SOURCES_podcast = podcast.c
......@@ -10,13 +13,14 @@ libsap_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_sap) $(SOCKET_LIBS)
if HAVE_WIN32
libsap_plugin_la_DEPENDENCIES = libsap_plugin.rc.o
endif
sd_LTLIBRARIES += libsap_plugin.la
libpulselist_plugin_la_SOURCES = pulse.c
libpulselist_plugin_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS)
libpulselist_plugin_la_LIBADD = ../libvlc_pulse.la \
$(AM_LIBADD) $(PULSE_LIBS)
if HAVE_PULSE
libvlc_LTLIBRARIES += libpulselist_plugin.la
sd_LTLIBRARIES += libpulselist_plugin.la
endif
libudev_plugin_la_SOURCES = udev.c
......@@ -26,6 +30,9 @@ if HAVE_ALSA
libudev_plugin_la_CFLAGS += $(ALSA_CFLAGS) -DHAVE_ALSA
libudev_plugin_la_LIBADD += $(ALSA_LIBS)
endif
libudev_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(sddir)'
EXTRA_LTLIBRARIES += libudev_plugin.la
sd_LTLIBRARIES += $(LTLIBudev)
libxcb_apps_plugin_la_SOURCES = xcb_apps.c
libxcb_apps_plugin_la_CFLAGS = $(AM_CFLAGS) \
......@@ -33,14 +40,14 @@ libxcb_apps_plugin_la_CFLAGS = $(AM_CFLAGS) \
libxcb_apps_plugin_la_LIBADD = $(AM_LIBADD) \
$(XCB_LIBS)
if HAVE_XCB
libvlc_LTLIBRARIES += libxcb_apps_plugin.la
sd_LTLIBRARIES += libxcb_apps_plugin.la
endif
libwindrive_plugin_la_SOURCES = windrive.c
libwindrive_plugin_la_CFLAGS = $(AM_CFLAGS)
libwindrive_plugin_la_LIBADD = $(AM_LIBADD)
if HAVE_WIN32
libvlc_LTLIBRARIES += libwindrive_plugin.la
sd_LTLIBRARIES += libwindrive_plugin.la
libwindrive_plugin_la_DEPENDENCIES = libwindrive_plugin.rc.o
endif
......@@ -48,13 +55,9 @@ libos2drive_plugin_la_SOURCES = os2drive.c
libos2drive_plugin_la_CFLAGS = $(AM_CFLAGS)
libos2drive_plugin_la_LIBADD = $(AM_LIBADD)
if HAVE_OS2
libvlc_LTLIBRARIES += libos2drive_plugin.la
sd_LTLIBRARIES += libos2drive_plugin.la
endif
EXTRA_LTLIBRARIES += \
libudev_plugin.la
libvlc_LTLIBRARIES += \
services_discovery_LTLIBRARIES += \
libmediadirs_plugin.la \
libpodcast_plugin.la \
libsap_plugin.la \
$(LTLIBudev)
libpodcast_plugin.la
modules/stream_filter/Makefile.am
View file @ e67cf044
basedir = stream_filter
include $(top_srcdir)/modules/common.am
libvlc_LTLIBRARIES =
stream_filterdir = $(pluginsdir)/stream_filter
stream_filter_LTLIBRARIES =
libdecomp_plugin_la_SOURCES = decomp.c
libdecomp_plugin_la_CFLAGS = $(AM_CFLAGS)
libdecomp_plugin_la_LIBADD = $(AM_LIBADD)
if !HAVE_WIN32
libvlc_LTLIBRARIES += libdecomp_plugin.la
stream_filter_LTLIBRARIES += libdecomp_plugin.la
endif
libdash_plugin_la_SOURCES = \
......@@ -94,7 +95,7 @@ libdash_plugin_la_SOURCES = \
dash/Helper.h
libdash_plugin_la_CXXFLAGS = $(AM_CFLAGS) -I$(srcdir)/dash
libdash_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
libvlc_LTLIBRARIES += libdash_plugin.la
stream_filter_LTLIBRARIES += libdash_plugin.la
if HAVE_WIN32
libdash_plugin_la_DEPENDENCIES = libdash_plugin.rc.o
endif
......@@ -109,7 +110,7 @@ libsmooth_plugin_la_CFLAGS = $(AM_CFLAGS)
if HAVE_WIN32
libsmooth_plugin_la_DEPENDENCIES = libsmooth_plugin.rc.o
endif
libvlc_LTLIBRARIES += libsmooth_plugin.la
stream_filter_LTLIBRARIES += libsmooth_plugin.la
libhttplive_plugin_la_SOURCES = httplive.c
libhttplive_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
......@@ -118,7 +119,7 @@ if HAVE_WIN32
libhttplive_plugin_la_DEPENDENCIES = libhttplive_plugin.rc.o
endif
if HAVE_GCRYPT
libvlc_LTLIBRARIES += libhttplive_plugin.la
stream_filter_LTLIBRARIES += libhttplive_plugin.la
endif
librecord_plugin_la_SOURCES = record.c
......@@ -127,4 +128,4 @@ librecord_plugin_la_LIBADD = $(AM_LIBADD)
if HAVE_WIN32
librecord_plugin_la_DEPENDENCIES = librecord_plugin.rc.o
endif
libvlc_LTLIBRARIES += librecord_plugin.la
stream_filter_LTLIBRARIES += librecord_plugin.la
modules/stream_out/Modules.am
View file @ e67cf044
......@@ -25,7 +25,7 @@ libstream_out_transcode_plugin_la_DEPENDENCIES = libstream_out_transcode_plugin.
endif
libvlc_LTLIBRARIES += \
stream_out_LTLIBRARIES += \
libstream_out_dummy_plugin.la \
libstream_out_delay_plugin.la \
libstream_out_description_plugin.la \
......@@ -44,7 +44,7 @@ libvlc_LTLIBRARIES += \
libstream_out_transcode_plugin.la
# RTP plugin
libvlc_LTLIBRARIES += \
stream_out_LTLIBRARIES += \
libstream_out_rtp_plugin.la
libstream_out_rtp_plugin_la_SOURCES = \
rtp.c rtp.h rtpfmt.c rtcp.c rtsp.c vod.c
......@@ -69,7 +69,7 @@ if HAVE_WIN32
libstream_out_raop_plugin_la_DEPENDENCIES = libstream_out_raop_plugin.rc.o
endif
if HAVE_GCRYPT
libvlc_LTLIBRARIES += libstream_out_raop_plugin.la
stream_out_LTLIBRARIES += libstream_out_raop_plugin.la
endif
BUILT_SOURCES += dummy.cpp
......
modules/text_renderer/Modules.am
View file @ e67cf044
......@@ -4,4 +4,4 @@ SOURCES_svg = svg.c
SOURCES_tdummy = tdummy.c
SOURCES_win32text = win32text.c
libvlc_LTLIBRARIES += libtdummy_plugin.la
text_renderer_LTLIBRARIES += libtdummy_plugin.la
modules/video_chroma/Makefile.am
View file @ e67cf044
basedir = video_chroma
include $(top_srcdir)/modules/common.am
chromadir = $(pluginsdir)/video_chroma
libchain_plugin_la_SOURCES = chain.c
libchain_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
......@@ -11,6 +11,7 @@ libchroma_omx_plugin_la_LIBADD = $(AM_LIBADD) $(OMXIP_LIBS)
libswscale_plugin_la_SOURCES = swscale.c ../codec/avcodec/chroma.c
libswscale_plugin_la_CFLAGS = $(AM_CFLAGS) $(SWSCALE_CFLAGS)
libswscale_plugin_la_LIBADD = $(AM_LIBADD) $(SWSCALE_LIBS)
libswscale_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(chromadir)'
libgrey_yuv_plugin_la_SOURCES = grey_yuv.c
libgrey_yuv_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
......@@ -38,7 +39,7 @@ libyuy2_i420_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
libyuy2_i422_plugin_la_SOURCES = yuy2_i422.c
libyuy2_i422_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
libvlc_LTLIBRARIES = \
chroma_LTLIBRARIES = \
libi420_rgb_plugin.la \
libi420_yuy2_plugin.la \
libi422_i420_plugin.la \
......@@ -57,7 +58,7 @@ libi420_yuy2_altivec_plugin_la_SOURCES = i420_yuy2.c i420_yuy2.h
libi420_yuy2_altivec_plugin_la_CFLAGS = $(AM_CFLAGS) $(ALTIVEC_CFLAGS)
if HAVE_ALTIVEC
libvlc_LTLIBRARIES += \
chroma_LTLIBRARIES += \
libi420_yuy2_altivec_plugin.la
endif
......@@ -73,7 +74,7 @@ libi422_yuy2_mmx_plugin_la_SOURCES = i422_yuy2.c i422_yuy2.h
libi422_yuy2_mmx_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
if HAVE_MMX
libvlc_LTLIBRARIES += \
chroma_LTLIBRARIES += \
libi420_rgb_mmx_plugin.la \
libi420_yuy2_mmx_plugin.la \
libi422_yuy2_mmx_plugin.la
......@@ -91,7 +92,7 @@ libi422_yuy2_sse2_plugin_la_SOURCES = i422_yuy2.c i422_yuy2.h
libi422_yuy2_sse2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
if HAVE_SSE2
libvlc_LTLIBRARIES += \
chroma_LTLIBRARIES += \
libi420_rgb_sse2_plugin.la \
libi420_yuy2_sse2_plugin.la \
libi422_yuy2_sse2_plugin.la
......
modules/video_filter/Modules.am
View file @ e67cf044
......@@ -33,7 +33,7 @@ endif
if HAVE_WIN32
libdeinterlace_plugin_la_DEPENDENCIES = libdeinterlace_plugin.rc.o
endif
libvlc_LTLIBRARIES += libdeinterlace_plugin.la
video_filter_LTLIBRARIES += libdeinterlace_plugin.la
libdynamicoverlay_plugin_la_SOURCES = \
dynamicoverlay/dynamicoverlay_buffer.c \
......@@ -44,7 +44,7 @@ libdynamicoverlay_plugin_la_SOURCES = \
libdynamicoverlay_plugin_la_CFLAGS = $(AM_CFLAGS)
libdynamicoverlay_plugin_la_LIBADD = $(AM_LIBADD)
if !HAVE_WIN32
libvlc_LTLIBRARIES += libdynamicoverlay_plugin.la
video_filter_LTLIBRARIES += libdynamicoverlay_plugin.la
endif
libremoteosd_plugin_la_SOURCES = remoteosd.c remoteosd_rfbproto.h
......@@ -54,7 +54,7 @@ if HAVE_WIN32
libremoteosd_plugin_la_DEPENDENCIES = libremoteosd_plugin.rc.o
endif
if HAVE_GCRYPT
libvlc_LTLIBRARIES += libremoteosd_plugin.la
video_filter_LTLIBRARIES += libremoteosd_plugin.la
endif
libpuzzle_plugin_la_SOURCES = \
......@@ -68,7 +68,7 @@ libpuzzle_plugin_la_LIBADD = $(AM_LIBADD)
if HAVE_WIN32
libpuzzle_plugin_la_DEPENDENCIES = libpuzzle_plugin.rc.o
endif
libvlc_LTLIBRARIES += libpuzzle_plugin.la
video_filter_LTLIBRARIES += libpuzzle_plugin.la
SOURCES_magnify = magnify.c
SOURCES_wave = wave.c
......@@ -138,7 +138,7 @@ SOURCES_vhs = vhs.c
SOURCES_freeze = freeze.c
noinst_HEADERS = filter_picture.h
libvlc_LTLIBRARIES += \
video_filter_LTLIBRARIES += \
libadjust_plugin.la \
libalphamask_plugin.la \
libaudiobargraph_v_plugin.la \
......
modules/video_output/Modules.am
View file @ e67cf044
AM_LIBTOOLFLAGS=--tag=CC
voutdir = $(pluginsdir)/video_output
noinst_LTLIBRARIES =
vout_LTLIBRARIES =
SOURCES_aa = aa.c
SOURCES_fb = fb.c
......@@ -16,7 +18,7 @@ if HAVE_DECKLINK
libdecklinkoutput_plugin_la_SOURCES = decklink.cpp
libdecklinkoutput_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(CPPFLAGS_decklinkoutput)
libdecklinkoutput_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_decklink) $(LIBDL)
libvlc_LTLIBRARIES += libdecklinkoutput_plugin.la
vout_LTLIBRARIES += libdecklinkoutput_plugin.la
endif
### OpenGL ###
......@@ -24,30 +26,20 @@ endif
libgles2_plugin_la_SOURCES = opengl.c opengl.h gl.c
libgles2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES2_CFLAGS) -DUSE_OPENGL_ES=2
libgles2_plugin_la_LIBADD = $(AM_LIBADD) $(GLES2_LIBS)
if HAVE_WIN32
libgles2_plugin_la_DEPENDENCIES = libgles2_plugin.rc.o
endif
libgles2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
libgles1_plugin_la_SOURCES = opengl.c opengl.h gl.c
libgles1_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES1_CFLAGS) -DUSE_OPENGL_ES=1
libgles1_plugin_la_LIBADD = $(AM_LIBADD) $(GLES1_LIBS)
if HAVE_WIN32
libgles1_plugin_la_DEPENDENCIES = libgles1_plugin.rc.o
endif
libgles1_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
libgl_plugin_la_SOURCES = opengl.c opengl.h gl.c
libgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
libgl_plugin_la_LIBADD = $(AM_LIBADD) $(GL_LIBS)
if HAVE_WIN32
libgl_plugin_la_DEPENDENCIES = libgl_plugin.rc.o
endif
libgl_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
EXTRA_LTLIBRARIES += \
libgles2_plugin.la \
libgles1_plugin.la \
libgl_plugin.la
libvlc_LTLIBRARIES += \
$(LTLIBgles2) $(LTLIBgles1) $(LTLIBgl)
EXTRA_LTLIBRARIES += libgles2_plugin.la libgles1_plugin.la libgl_plugin.la
vout_LTLIBRARIES += $(LTLIBgles2) $(LTLIBgles1) $(LTLIBgl)
### XCB ###
......@@ -72,6 +64,7 @@ libxcb_xv_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_XV_CFLAGS)
libxcb_xv_plugin_la_LIBADD = libvlc_xcb_events.la $(AM_LIBADD) \
$(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_XV_LIBS)
libxcb_xv_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
libxcb_glx_plugin_la_SOURCES = \
opengl.c opengl.h \
......@@ -80,6 +73,7 @@ libxcb_glx_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(XCB_CFLAGS) $(GL_CFLAGS)
libxcb_glx_plugin_la_LIBADD = libvlc_xcb_events.la $(AM_LIBADD) \
$(XCB_LIBS) $(GL_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
libxcb_glx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
libxcb_window_plugin_la_SOURCES = xcb/window.c xcb/keys.c xcb/keysym.h xcb/xcb_keysym.h
libxcb_window_plugin_la_CFLAGS = $(AM_CFLAGS) \
......@@ -94,58 +88,44 @@ libxcb_window_plugin_la_LIBADD = $(AM_LIBADD) \
if HAVE_XCB
noinst_LTLIBRARIES += libvlc_xcb_events.la
libvlc_LTLIBRARIES += \
vout_LTLIBRARIES += \
libxcb_x11_plugin.la \
libxcb_window_plugin.la
endif
EXTRA_LTLIBRARIES += \
libxcb_xv_plugin.la \
libxcb_glx_plugin.la
libvlc_LTLIBRARIES += \
$(LTLIBxcb_xv) \
$(LTLIBxcb_glx)
EXTRA_LTLIBRARIES += libxcb_xv_plugin.la libxcb_glx_plugin.la
vout_LTLIBRARIES += $(LTLIBxcb_xv) $(LTLIBxcb_glx)
### Win32 ###
libdirect2d_plugin_la_SOURCES = msw/direct2d.c \
msw/common.c msw/common.h msw/events.c msw/events.h
libdirect2d_plugin_la_CFLAGS = $(AM_CFLAGS)
libdirect2d_plugin_la_LIBADD = $(AM_LIBADD) -lgdi32 -lole32 -luuid
if HAVE_WIN32
libdirect2d_plugin_la_DEPENDENCIES = libdirect2d_plugin.rc.o
endif
libvlc_LTLIBRARIES += $(LTLIBdirect2d)
libdirect2d_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
vout_LTLIBRARIES += $(LTLIBdirect2d)
EXTRA_LTLIBRARIES += libdirect2d_plugin.la
libdirect3d_plugin_la_SOURCES = msw/direct3d.c \
msw/common.c msw/common.h msw/events.c msw/events.h
libdirect3d_plugin_la_CFLAGS = $(AM_CFLAGS)
libdirect3d_plugin_la_LIBADD = $(AM_LIBADD) -lgdi32 -lole32 -luuid
if HAVE_WIN32
libdirect3d_plugin_la_DEPENDENCIES = libdirect3d_plugin.rc.o
endif
libvlc_LTLIBRARIES += $(LTLIBdirect3d)
libdirect3d_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
vout_LTLIBRARIES += $(LTLIBdirect3d)
EXTRA_LTLIBRARIES += libdirect3d_plugin.la
libdirectdraw_plugin_la_SOURCES = msw/directx.c \
msw/common.c msw/common.h msw/events.c msw/events.h
libdirectdraw_plugin_la_CFLAGS = $(AM_CFLAGS)
libdirectdraw_plugin_la_LIBADD = $(AM_LIBADD) -luser32 -lgdi32 -lole32 -luuid
if HAVE_WIN32
libdirectdraw_plugin_la_DEPENDENCIES = libdirectdraw_plugin.rc.o
endif
if HAVE_DIRECTX
libvlc_LTLIBRARIES += libdirectdraw_plugin.la
vout_LTLIBRARIES += libdirectdraw_plugin.la
endif
libglwin32_plugin_la_SOURCES = msw/glwin32.c opengl.c opengl.h \
msw/common.c msw/common.h msw/events.c msw/events.h
libglwin32_plugin_la_CFLAGS = $(AM_CFLAGS)
libglwin32_plugin_la_LIBADD = $(AM_LIBADD) -lopengl32 -lgdi32 -lole32 -luuid
if HAVE_WIN32
libglwin32_plugin_la_DEPENDENCIES = libglwin32_plugin.rc.o
endif
libvlc_LTLIBRARIES += $(LTLIBglwin32)
libglwin32_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
vout_LTLIBRARIES += $(LTLIBglwin32)
EXTRA_LTLIBRARIES += libglwin32_plugin.la
libwingdi_plugin_la_SOURCES = msw/wingdi.c \
......@@ -153,7 +133,7 @@ libwingdi_plugin_la_SOURCES = msw/wingdi.c \
libwingdi_plugin_la_CFLAGS = $(AM_CFLAGS)
libwingdi_plugin_la_LIBADD = $(AM_LIBADD) -lgdi32 -lole32 -luuid
if HAVE_WIN32
libvlc_LTLIBRARIES += libwingdi_plugin.la
vout_LTLIBRARIES += libwingdi_plugin.la
libwingdi_plugin_la_DEPENDENCIES = libwingdi_plugin.rc.o
endif
......@@ -161,20 +141,20 @@ libdrawable_plugin_la_SOURCES = drawable.c
libdrawable_plugin_la_CFLAGS = $(AM_CFLAGS)
libdrawable_plugin_la_LIBADD = $(AM_LIBADD)
if HAVE_WIN32
libvlc_LTLIBRARIES += libdrawable_plugin.la
vout_LTLIBRARIES += libdrawable_plugin.la
libdrawable_plugin_la_DEPENDENCIES = libdrawable_plugin.rc.o
endif
### OS/2 ###
if HAVE_OS2
libvlc_LTLIBRARIES += libdrawable_plugin.la
vout_LTLIBRARIES += libdrawable_plugin.la
endif
libkva_plugin_la_SOURCES = kva.c
libkva_plugin_la_CFLAGS = $(AM_CFLAGS)
libkva_plugin_la_LIBADD = $(AM_LIBADD) $(KVA_LIBS)
if HAVE_KVA
libvlc_LTLIBRARIES += libkva_plugin.la
vout_LTLIBRARIES += libkva_plugin.la
endif
### EGL ###
......@@ -185,11 +165,10 @@ if !HAVE_WIN32
if !HAVE_DARWIN
libegl_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIBS) -lX11
endif
else
libegl_plugin_la_DEPENDENCIES = libegl_plugin.rc.o
endif
libegl_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
EXTRA_LTLIBRARIES += libegl_plugin.la
libvlc_LTLIBRARIES += $(LTLIBegl)
vout_LTLIBRARIES += $(LTLIBegl)
### GLX ###
libglx_plugin_la_SOURCES = glx.c
......@@ -198,8 +177,9 @@ libglx_plugin_la_LIBADD = $(AM_LIBADD) $(GL_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
if HAVE_WIN32
libglx_plugin_la_DEPENDENCIES = libglx_plugin.rc.o
endif
libglx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
EXTRA_LTLIBRARIES += libglx_plugin.la
libvlc_LTLIBRARIES += $(LTLIBglx)
vout_LTLIBRARIES += $(LTLIBglx)
### Coloured ASCII art ###
libcaca_plugin_la_SOURCES = caca.c
......@@ -209,11 +189,10 @@ if !HAVE_WIN32
if !HAVE_DARWIN
libcaca_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIBS) -lX11
endif
else
libcaca_plugin_la_DEPENDENCIES = libcaca_plugin.rc.o
endif
libcaca_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
EXTRA_LTLIBRARIES += libcaca_plugin.la
libvlc_LTLIBRARIES += $(LTLIBcaca)
vout_LTLIBRARIES += $(LTLIBcaca)
### Common ###
libvdummy_plugin_la_SOURCES = vdummy.c
......@@ -223,7 +202,7 @@ if HAVE_WIN32
libvdummy_plugin_la_DEPENDENCIES = libvdummy_plugin.rc.o
endif
libvlc_LTLIBRARIES += \
vout_LTLIBRARIES += \
libvdummy_plugin.la \
libvmem_plugin.la \
libyuv_plugin.la
modules/video_splitter/Makefile.am
View file @ e67cf044
basedir = video_splitter
include $(top_srcdir)/modules/common.am
splitterdir = $(pluginsdir)/video_splitter
libvlc_LTLIBRARIES = \
splitter_LTLIBRARIES = \
libclone_plugin.la \
libwall_plugin.la
......@@ -22,12 +21,12 @@ libpanoramix_plugin_la_SOURCES = panoramix.c
libpanoramix_plugin_la_CFLAGS = $(AM_CFLAGS)
libpanoramix_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
if HAVE_WIN32
libvlc_LTLIBRARIES += libpanoramix_plugin.la
splitter_LTLIBRARIES += libpanoramix_plugin.la
libpanoramix_plugin_la_DEPENDENCIES = libpanoramix_plugin.rc.o
else
if HAVE_XCB_RANDR
libpanoramix_plugin_la_CFLAGS += $(XCB_RANDR_CFLAGS)
libpanoramix_plugin_la_LIBADD += $(XCB_RANDR_LIBS)
libvlc_LTLIBRARIES += libpanoramix_plugin.la
splitter_LTLIBRARIES += libpanoramix_plugin.la
endif
endif
modules/visualization/Modules.am
View file @ e67cf044
......@@ -10,7 +10,7 @@ libvisual_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
if HAVE_WIN32
libvisual_plugin_la_DEPENDENCIES = libvisual_plugin.rc.o
endif
libvlc_LTLIBRARIES += libvisual_plugin.la
visualization_LTLIBRARIES += libvisual_plugin.la
SOURCES_vsxu = vsxu.cpp cyclic_buffer.h
......
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