Skip to content

Commit fc25a3a

Browse files
author
Rémi Denis-Courmont
committed
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.
1 parent 98cea7a commit fc25a3a

File tree

3 files changed

+99
-99
lines changed

3 files changed

+99
-99
lines changed

configure.ac

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4231,7 +4231,6 @@ AC_CONFIG_FILES([
42314231
lib/Makefile
42324232
bin/Makefile
42334233
test/Makefile
4234-
modules/access/Makefile
42354234
modules/access/rtp/Makefile
42364235
modules/access_output/Makefile
42374236
modules/audio_filter/Makefile

modules/Makefile.am

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
noinst_LTLIBRARIES =
22
BASE_SUBDIRS = \
3-
access \
3+
access/rtp \
44
audio_filter \
55
audio_mixer \
66
audio_output \
@@ -55,6 +55,9 @@ if HAVE_PULSE
5555
noinst_LTLIBRARIES += libvlc_pulse.la
5656
endif
5757

58+
include common.am
59+
include access/Makefile.am
60+
5861
if HAVE_WIN32
5962
module.rc: $(top_builddir)/modules/module.rc.in $(top_builddir)/config.status
6063
$(AM_V_GEN) cd "$(top_builddir)" && $(SHELL) ./config.status --file="modules/$@"

0 commit comments

Comments
 (0)