Commit 7690e538 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Do not wander twice in the same subdir - fix distcheck

parent 937e8985
......@@ -7,11 +7,12 @@
# which have makefiles with distribution information.
# - src (libvlc) is nedeed by modules, mozilla and bindings
# - libs/* are needed by modules
BASE_SUBDIRS = po src modules share doc test
EXTRA_SUBDIRS = m4 extras/package/ipkg \
bindings/python \
libs/loader libs/srtp \
projects/mozilla projects/activex
DIST_SUBDIRS = $(SUBDIRS) $(EXTRA_SUBDIRS)
DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
SUBDIRS = po src
if LOADER
......
SUBDIRS = \
BASE_SUBDIRS = \
access \
access_filter \
audio_filter \
......@@ -20,11 +20,12 @@ EXTRA_SUBDIRS = \
access_output \
mux \
stream_out
SUBDIRS = $(BASE_SUBDIRS)
DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
if ENABLE_SOUT
SUBDIRS += access_output mux stream_out
endif
DIST_SUBDIRS = $(SUBDIRS) $(EXTRA_SUBDIRS)
dist_noinst_SCRIPTS = genmf list.sh
dist_noinst_DATA = LIST
......@@ -3,9 +3,10 @@
# obviously does not. Here is a fix for that.
LIBTOOL=@LIBTOOL@ --tag=CC
BASE_SUBDIRS = dvb mms cdda rtsp rtmp v4l2 vcd vcdx screen
EXTRA_SUBDIRS = bda dshow
SUBDIRS = dvb mms cdda rtsp rtmp v4l2 vcd vcdx screen
DIST_SUBDIRS = $(EXTRA_SUBDIRS) $(SUBDIRS)
SUBDIRS = $(BASE_SUBDIRS)
DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
if HAVE_WIN32
SUBDIRS += bda dshow
......
SUBDIRS = dummy memcpy notify testsuite playlist osd xml probe
DIST_SUBDIRS = lua $(SUBDIRS)
BASE_SUBDIRS = dummy memcpy notify testsuite playlist osd xml probe
EXTRA_SUBDIRS = lua
SUBDIRS = $(BASE_SUBDIRS)
DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
if BUILD_LUA
SUBDIRS += lua
......
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