Skip to content

Commit e67cf04

Browse files
author
Rémi Denis-Courmont
committed
modules: use different directory prefixes for each plugins subdirectory
This is just a step toward less recursion.
1 parent 59b95f3 commit e67cf04

File tree

29 files changed

+245
-250
lines changed

29 files changed

+245
-250
lines changed

modules/access/Makefile.am

Lines changed: 74 additions & 58 deletions
Large diffs are not rendered by default.

modules/access/rtp/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
basedir = access
21
include $(top_srcdir)/modules/common.am
2+
accessdir = $(pluginsdir)/access
33

44
# RTP plugin
5-
libvlc_LTLIBRARIES = librtp_plugin.la
5+
access_LTLIBRARIES = librtp_plugin.la
66
librtp_plugin_la_SOURCES = \
77
rtp.c \
88
rtp.h \

modules/access_output/Modules.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SOURCES_access_output_udp = udp.c
44
SOURCES_access_output_http = http.c bonjour.c bonjour.h
55
SOURCES_access_output_shout = shout.c
66

7-
libvlc_LTLIBRARIES += \
7+
access_output_LTLIBRARIES += \
88
libaccess_output_dummy_plugin.la \
99
libaccess_output_file_plugin.la \
1010
libaccess_output_udp_plugin.la \
@@ -18,5 +18,5 @@ libaccess_output_livehttp_plugin_la_LIBADD = $(AM_LIBADD) $(GCRYPT_LIBS) -lgpg-e
1818
if HAVE_WIN32
1919
libaccess_output_livehttp_plugin_la_DEPENDENCIES = libaccess_output_livehttp_plugin.rc.o
2020
endif
21-
libvlc_LTLIBRARIES += libaccess_output_livehttp_plugin.la
21+
access_output_LTLIBRARIES += libaccess_output_livehttp_plugin.la
2222
endif

modules/arm_neon/Makefile.am

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
basedir = arm_neon
2-
include $(top_srcdir)/modules/common.am
3-
41
AM_LIBTOOLFLAGS=--tag=CC
2+
include $(top_srcdir)/modules/common.am
3+
neondir = $(pluginsdir)/arm_neon
54

65
libsimple_channel_mixer_neon_plugin_la_SOURCES = \
76
simple_channel_mixer.S \
@@ -31,7 +30,7 @@ libyuv_rgb_neon_plugin_la_SOURCES = \
3130
libyuv_rgb_neon_plugin_la_CFLAGS = $(AM_CFLAGS)
3231
libyuv_rgb_neon_plugin_la_LIBADD = $(AM_LIBADD)
3332

34-
libvlc_LTLIBRARIES = \
33+
neon_LTLIBRARIES = \
3534
libsimple_channel_mixer_neon_plugin.la \
3635
libchroma_yuv_neon_plugin.la \
3736
libvolume_neon_plugin.la \

modules/audio_filter/Modules.am

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ SOURCES_spatializer = \
1616
spatializer/revmodel.cpp spatializer/revmodel.hpp \
1717
spatializer/spatializer.cpp
1818

19-
libvlc_LTLIBRARIES += \
19+
audio_filter_LTLIBRARIES += \
2020
libaudiobargraph_a_plugin.la \
2121
libchorus_flanger_plugin.la \
2222
libcompressor_plugin.la \
@@ -37,7 +37,7 @@ SOURCES_dolby_surround_decoder = channel_mixer/dolby.c
3737
SOURCES_mono = channel_mixer/mono.c
3838
SOURCES_remap = channel_mixer/remap.c
3939

40-
libvlc_LTLIBRARIES += \
40+
audio_filter_LTLIBRARIES += \
4141
libdolby_surround_decoder_plugin.la \
4242
libheadphone_channel_mixer_plugin.la \
4343
libmono_plugin.la \
@@ -58,7 +58,7 @@ if HAVE_WIN32
5858
libaudio_format_plugin_la_DEPENDENCIES = libaudio_format_plugin.rc.o
5959
endif
6060

61-
libvlc_LTLIBRARIES += \
61+
audio_filter_LTLIBRARIES += \
6262
liba52tospdif_plugin.la \
6363
libaudio_format_plugin.la \
6464
libdtstospdif_plugin.la
@@ -69,7 +69,7 @@ SOURCES_bandlimited_resampler = \
6969
SOURCES_ugly_resampler = resampler/ugly.c
7070
SOURCES_samplerate = resampler/src.c
7171

72-
libvlc_LTLIBRARIES += \
72+
audio_filter_LTLIBRARIES += \
7373
libugly_resampler_plugin.la
7474
EXTRA_LTLIBRARIES += \
7575
libbandlimited_resampler_plugin.la
@@ -81,5 +81,5 @@ if HAVE_WIN32
8181
libspeex_resampler_plugin_la_DEPENDENCIES = libspeex_resampler_plugin.rc.o
8282
endif
8383
if HAVE_SPEEXDSP
84-
libvlc_LTLIBRARIES += libspeex_resampler_plugin.la
84+
audio_filter_LTLIBRARIES += libspeex_resampler_plugin.la
8585
endif

modules/audio_mixer/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
basedir = audio_mixer
21
include $(top_srcdir)/modules/common.am
2+
audio_mixerdir = $(pluginsdir)/audio_mixer
33

44
libfloat_mixer_plugin_la_SOURCES = float.c
55
libfloat_mixer_plugin_la_CFLAGS = $(AM_CFLAGS)
@@ -15,6 +15,6 @@ if HAVE_WIN32
1515
libinteger_mixer_plugin_la_DEPENDENCIES = libinteger_mixer_plugin.rc.o
1616
endif
1717

18-
libvlc_LTLIBRARIES = \
18+
audio_mixer_LTLIBRARIES = \
1919
libfloat_mixer_plugin.la \
2020
libinteger_mixer_plugin.la

modules/audio_output/Modules.am

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
aoutdir = $(pluginsdir)/audio_output
2+
aout_LTLIBRARIES =
3+
14
SOURCES_waveout = waveout.c windows_audio_common.h
25
SOURCES_auhal = TPCircularBuffer.h TPCircularBuffer.c auhal.c
36
SOURCES_audiounit_ios = TPCircularBuffer.h TPCircularBuffer.c audiounit_ios.c
@@ -12,7 +15,7 @@ libandroid_audiotrack_plugin_la_CFLAGS = $(AM_CFLAGS)
1215
libandroid_audiotrack_plugin_la_LIBADD = $(AM_LIBADD) -ldl
1316

1417
if HAVE_ANDROID
15-
libvlc_LTLIBRARIES += libandroid_audiotrack_plugin.la libopensles_android_plugin.la
18+
aout_LTLIBRARIES += libandroid_audiotrack_plugin.la libopensles_android_plugin.la
1619
endif
1720

1821
libadummy_plugin_la_SOURCES = adummy.c
@@ -36,7 +39,7 @@ if HAVE_WIN32
3639
libamem_plugin_la_DEPENDENCIES = libamem_plugin.rc.o
3740
endif
3841

39-
libvlc_LTLIBRARIES += \
42+
aout_LTLIBRARIES += \
4043
libadummy_plugin.la \
4144
libafile_plugin.la \
4245
libamem_plugin.la
@@ -45,29 +48,29 @@ liboss_plugin_la_SOURCES = oss.c volume.h
4548
liboss_plugin_la_CFLAGS = $(AM_CFLAGS)
4649
liboss_plugin_la_LIBADD = $(AM_LIBADD) $(OSS_LIBS) $(LIBM)
4750
if HAVE_OSS
48-
libvlc_LTLIBRARIES += liboss_plugin.la
51+
aout_LTLIBRARIES += liboss_plugin.la
4952
endif
5053

5154
libalsa_plugin_la_SOURCES = alsa.c volume.h
5255
libalsa_plugin_la_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS)
5356
libalsa_plugin_la_LIBADD = $(AM_LIBADD) $(ALSA_LIBS) $(LIBM)
5457
if HAVE_ALSA
55-
libvlc_LTLIBRARIES += libalsa_plugin.la
58+
aout_LTLIBRARIES += libalsa_plugin.la
5659
endif
5760

5861
libpulse_plugin_la_SOURCES = pulse.c
5962
libpulse_plugin_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS)
6063
libpulse_plugin_la_LIBADD = ../libvlc_pulse.la \
6164
$(AM_LIBADD) $(PULSE_LIBS) $(LIBM)
6265
if HAVE_PULSE
63-
libvlc_LTLIBRARIES += libpulse_plugin.la
66+
aout_LTLIBRARIES += libpulse_plugin.la
6467
endif
6568

6669
libjack_plugin_la_SOURCES = jack.c volume.h
6770
libjack_plugin_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS)
6871
libjack_plugin_la_LIBADD = $(AM_LIBADD) $(JACK_LIBS) $(LIBM)
6972
if HAVE_JACK
70-
libvlc_LTLIBRARIES += libjack_plugin.la
73+
aout_LTLIBRARIES += libjack_plugin.la
7174
endif
7275

7376
libmmdevice_plugin_la_SOURCES = mmdevice.c mmdevice.h wasapi.c
@@ -77,7 +80,7 @@ if HAVE_WIN32
7780
libmmdevice_plugin_la_DEPENDENCIES = libmmdevice_plugin.rc.o
7881
endif
7982
if HAVE_WASAPI
80-
libvlc_LTLIBRARIES += libmmdevice_plugin.la
83+
aout_LTLIBRARIES += libmmdevice_plugin.la
8184
endif
8285

8386
libdirectsound_plugin_la_SOURCES = directx.c windows_audio_common.h
@@ -87,19 +90,19 @@ if HAVE_WIN32
8790
libdirectsound_plugin_la_DEPENDENCIES = libdirectsound_plugin.rc.o
8891
endif
8992
if HAVE_DIRECTX
90-
libvlc_LTLIBRARIES += libdirectsound_plugin.la
93+
aout_LTLIBRARIES += libdirectsound_plugin.la
9194
endif
9295

9396
libkai_plugin_la_SOURCES = kai.c
9497
libkai_plugin_la_CFLAGS = $(AM_CFLAGS)
9598
libkai_plugin_la_LIBADD = $(AM_LIBADD) $(KAI_LIBS)
9699
if HAVE_KAI
97-
libvlc_LTLIBRARIES += libkai_plugin.la
100+
aout_LTLIBRARIES += libkai_plugin.la
98101
endif
99102

100103
libsndio_plugin_la_SOURCES = sndio.c
101104
libsndio_plugin_la_CFLAGS = $(AM_CFLAGS)
102105
libsndio_plugin_la_LIBADD = $(AM_LIBADD) -lsndio
103106
if HAVE_SNDIO
104-
libvlc_LTLIBRARIES += libsndio_plugin.la
107+
aout_LTLIBRARIES += libsndio_plugin.la
105108
endif

modules/codec/Modules.am

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ SOURCES_fdkaac = fdkaac.c
5252
SOURCES_scte27 = scte27.c
5353
SOURCES_qsv = qsv.c
5454

55-
libvlc_LTLIBRARIES += \
55+
codec_LTLIBRARIES += \
5656
libcc_plugin.la \
5757
libcdg_plugin.la \
5858
libcvdsub_plugin.la \
@@ -68,7 +68,7 @@ libvlc_LTLIBRARIES += \
6868
$(NULL)
6969

7070
if ENABLE_SOUT
71-
libvlc_LTLIBRARIES += \
71+
codec_LTLIBRARIES += \
7272
libt140_plugin.la \
7373
libedummy_plugin.la
7474
endif
@@ -107,7 +107,7 @@ libmpeg_audio_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
107107
libuleaddvaudio_plugin_la_SOURCES = uleaddvaudio.c
108108
libuleaddvaudio_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
109109

110-
libvlc_LTLIBRARIES += \
110+
codec_LTLIBRARIES += \
111111
liba52_plugin.la \
112112
libadpcm_plugin.la \
113113
libaes3_plugin.la \
@@ -153,7 +153,7 @@ endif
153153
libavcodec_plugin_la_CFLAGS += -DMERGE_FFMPEG
154154
endif
155155
if HAVE_AVCODEC
156-
libvlc_LTLIBRARIES += libavcodec_plugin.la
156+
codec_LTLIBRARIES += libavcodec_plugin.la
157157
endif
158158

159159
### avcodec hardware acceleration ###
@@ -166,15 +166,15 @@ libvaapi_plugin_la_CFLAGS = $(AM_CFLAGS) \
166166
libvaapi_plugin_la_LIBADD = $(AM_LIBADD) \
167167
$(LIBVA_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
168168
if HAVE_AVCODEC_VAAPI
169-
libvlc_LTLIBRARIES += libvaapi_plugin.la
169+
codec_LTLIBRARIES += libvaapi_plugin.la
170170
endif
171171

172172
libdxva2_plugin_la_SOURCES = \
173173
avcodec/copy.c avcodec/copy.h \
174174
avcodec/dxva2.c
175175
libdxva2_plugin_la_LIBADD = $(AM_LIBADD) -lole32 -lshlwapi -luuid
176176
if HAVE_AVCODEC_DXVA2
177-
libvlc_LTLIBRARIES += libdxva2_plugin.la
177+
codec_LTLIBRARIES += libdxva2_plugin.la
178178
endif
179179
libdxva2_plugin_la_DEPENDENCIES = libdxva2_plugin.rc.o
180180

@@ -184,15 +184,15 @@ libvda_plugin_la_SOURCES = \
184184
libvda_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVCODEC_CFLAGS)
185185
libvda_plugin_la_LDFLAGS = -Wl,-framework,CoreFoundation,-framework,VideoDecodeAcceleration,-framework,QuartzCore
186186
if HAVE_AVCODEC_VDA
187-
libvlc_LTLIBRARIES += libvda_plugin.la
187+
codec_LTLIBRARIES += libvda_plugin.la
188188
endif
189189

190190
libhwdummy_plugin_la_SOURCES = avcodec/hwdummy.c
191191
libhwdummy_plugin_la_CFLAGS = $(AM_CFLAGS) $(VDPAU_CFLAGS) $(AVCODEC_CFLAGS)
192192
libhwdummy_plugin_la_LIBADD = $(AM_LIBADD) $(AVCODEC_LIBS)
193193
# FIXME: hwdummy only needs libavutil, and only if avcodec < 55.13.0
194194
if HAVE_AVCODEC_VDPAU
195-
libvlc_LTLIBRARIES += libhwdummy_plugin.la
195+
codec_LTLIBRARIES += libhwdummy_plugin.la
196196
endif
197197
if HAVE_WIN32
198198
libhwdummy_plugin_la_DEPENDENCIES = libhwdummy_plugin.rc.o
@@ -202,10 +202,8 @@ endif
202202
libxwd_plugin_la_SOURCES = xwd.c
203203
libxwd_plugin_la_CFLAGS = $(AM_CFLAGS) $(XPROTO_CFLAGS)
204204
libxwd_plugin_la_LIBADD = $(AM_LIBADD) $(XPROTO_LIBS)
205-
if HAVE_WIN32
206-
libxwd_plugin_la_DEPENDENCIES = libxwd_plugin.rc.o
207-
endif
208-
libvlc_LTLIBRARIES += $(LTLIBxwd)
205+
libxwd_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
206+
codec_LTLIBRARIES += $(LTLIBxwd)
209207
EXTRA_LTLIBRARIES += libxwd_plugin.la
210208

211209
### OpenMAX ###
@@ -228,10 +226,12 @@ libomxil_plugin_la_SOURCES = \
228226
omxil/omxil.c omxil/omxil.h omxil/omxil_core.c omxil/omxil_core.h
229227
libomxil_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/omxil $(CFLAGS_omxil)
230228
libomxil_plugin_la_LIBADD = $(AM_LIBADD) $(LIBDL)
229+
libomxil_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
231230

232231
libomxil_vout_plugin_la_SOURCES = omxil/vout.c omxil/omxil_core.c omxil/utils.c omxil/qcom.c
233232
libomxil_vout_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/omxil $(CFLAGS_omxil_vout)
234233
libomxil_vout_plugin_la_LIBADD = $(AM_LIBADD) $(LIBDL)
234+
libomxil_vout_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
235235

236236
libiomx_plugin_la_SOURCES = $(libomxil_plugin_la_SOURCES)
237237
libiomx_plugin_la_CPPFLAGS = $(libomxil_plugin_la_CPPFLAGS) -DUSE_IOMX
@@ -240,9 +240,8 @@ libiomx_plugin_la_LIBADD = $(libomxil_plugin_la_LIBADD)
240240
libmediacodec_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/omxil
241241
libmediacodec_plugin_la_SOURCES = omxil/android_mediacodec.c omxil/utils.c
242242

243-
libvlc_LTLIBRARIES += $(LTLIBomxil) $(LTLIBomxil_vout)
243+
codec_LTLIBRARIES += $(LTLIBomxil) $(LTLIBomxil_vout)
244244
EXTRA_LTLIBRARIES += libomxil_plugin.la libomxil_vout_plugin.la
245245
if HAVE_ANDROID
246-
libvlc_LTLIBRARIES += libiomx_plugin.la libmediacodec_plugin.la
246+
codec_LTLIBRARIES += libiomx_plugin.la libmediacodec_plugin.la
247247
endif
248-

modules/common.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
AUTOMAKE_OPTIONS = subdir-objects
99

1010
NULL =
11-
libvlcdir = $(vlclibdir)/plugins/$(basedir)
11+
pluginsdir = $(vlclibdir)/plugins
1212
BUILT_SOURCES =
1313
CLEANFILES = $(BUILT_SOURCES)
1414

@@ -29,7 +29,7 @@ AM_CFLAGS =
2929
AM_CXXFLAGS =
3030
AM_OBJCFLAGS =
3131
AM_LIBADD = $(LIBPTHREAD)
32-
AM_LDFLAGS = -rpath '$(libvlcdir)' \
32+
AM_LDFLAGS = \
3333
-avoid-version -module \
3434
-export-symbols-regex ^vlc_entry \
3535
-shrext $(LIBEXT) \

modules/control/Modules.am

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ SOURCES_motion = \
1717
$(motion_extra) \
1818
$(NULL)
1919

20-
libvlc_LTLIBRARIES += \
20+
control_LTLIBRARIES += \
2121
libdummy_plugin.la \
2222
libgestures_plugin.la \
2323
libnetsync_plugin.la \
2424
libhotkeys_plugin.la \
2525
liboldrc_plugin.la
2626

2727
if HAVE_WIN32
28-
libvlc_LTLIBRARIES += libntservice_plugin.la
28+
control_LTLIBRARIES += libntservice_plugin.la
2929
else
30-
libvlc_LTLIBRARIES += libmotion_plugin.la
30+
control_LTLIBRARIES += libmotion_plugin.la
3131
endif
3232

3333
libdbus_plugin_la_SOURCES = \
@@ -39,19 +39,20 @@ libdbus_plugin_la_SOURCES = \
3939
libdbus_plugin_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
4040
libdbus_plugin_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) $(LIBM)
4141
if HAVE_DBUS
42-
libvlc_LTLIBRARIES += libdbus_plugin.la
42+
control_LTLIBRARIES += libdbus_plugin.la
4343
endif
4444

4545
libxcb_hotkeys_plugin_la_SOURCES = globalhotkeys/xcb.c
4646
libxcb_hotkeys_plugin_la_CFLAGS = $(AM_CFLAGS) \
4747
$(XCB_KEYSYMS_CFLAGS) $(XCB_CFLAGS)
4848
libxcb_hotkeys_plugin_la_LIBADD = $(AM_LIBADD) $(XCB_KEYSYMS_LIBS) $(XCB_LIBS)
49+
libxcb_hotkeys_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(controldir)'
4950
EXTRA_LTLIBRARIES += libxcb_hotkeys_plugin.la
50-
libvlc_LTLIBRARIES += $(LTLIBxcb_hotkeys)
51+
control_LTLIBRARIES += $(LTLIBxcb_hotkeys)
5152

5253
libwin_hotkeys_plugin_la_SOURCES = globalhotkeys/win32.c
5354
libwin_hotkeys_plugin_la_CFLAGS = $(AM_CFLAGS)
5455
libwin_hotkeys_plugin_la_LIBADD = $(AM_LIBADD)
5556
if HAVE_WIN32
56-
libvlc_LTLIBRARIES += libwin_hotkeys_plugin.la
57+
control_LTLIBRARIES += libwin_hotkeys_plugin.la
5758
endif

0 commit comments

Comments
 (0)