More avoidable directories

diff --git a/Makefile.am b/Makefile.am
index 2f12b663875d59e388c5ad122fe14a0cd380f541..0ffc51501117238fbc47bd3747e88c38d60c5c5d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,10 +9,18 @@
 #  - libs/* are needed by modules
 EXTRA_SUBDIRS = m4 extras/package/ipkg \
        bindings/python \
+       libs/loader libs/srtp \
        projects/mozilla projects/activex
-SUBDIRS = po libs/loader libs/srtp src modules share doc test
 DIST_SUBDIRS = $(SUBDIRS) $(EXTRA_SUBDIRS)
 
+SUBDIRS = po src
+if LOADER
+SUBDIRS += libs/loader
+endif
+if HAVE_LIBGCRYPT
+SUBDIRS += libs/srtp
+endif
+SUBDIRS += modules share doc test
 if BUILD_MOZILLA
 SUBDIRS += projects/mozilla
 endif

diff --git a/libs/loader/Makefile.am b/libs/loader/Makefile.am
index f211c2f4aa07446317f0189ca0d54115ae329026..2e7c7f93971ac69a528f984efde094c4ff3c8efd 100644 (file)
--- a/libs/loader/Makefile.am
+++ b/libs/loader/Makefile.am
@@ -9,9 +9,7 @@
 # by their respective owner(s).
 #
 
-if LOADER
 noinst_LTLIBRARIES = libloader.la
-endif
 
 # TODO: real check for vsscanf() and <sys/mmap.h>
 AM_CPPFLAGS = -D__WINE__ -DHAVE_SYS_MMAN_H=1 -DHAVE_VSSCANF=1 \

diff --git a/libs/srtp/Makefile.am b/libs/srtp/Makefile.am
index 31b74936cec2b8bac93b88311135a9df5b567556..901003cc34496ecdbbcc095dd6f9e8714f0e5261 100644 (file)
--- a/libs/srtp/Makefile.am
+++ b/libs/srtp/Makefile.am
@@ -25,11 +25,9 @@ endif
 noinst_HEADERS = srtp.h
 
 EXTRA_PROGRAMS = srtp
-if HAVE_LIBGCRYPT
 noinst_LTLIBRARIES = libvlc_srtp.la
 check_PROGRAMS = test-aes test-recv
 TESTS = $(check_PROGRAMS)
-endif
 
 libvlc_srtp_la_SOURCES = srtp.c
 srtp_SOURCES = recv.c

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 5d76ae05f5ff154f33ceda69f56ac25f2cd0084e..349bd6da11f1d5cdc3c6f30d7034f232d79967a3 100644 (file)
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -1,9 +1,16 @@
-SUBDIRS = bda dshow dvb mms cdda rtsp rtmp v4l2 vcd vcdx screen
 # Automake forgets to add a proper tag to libtool with Objective-C files.
 # Moreover Libtool should default tag to CC when none is specified but
 # obviously does not. Here is a fix for that.
 LIBTOOL=@LIBTOOL@ --tag=CC
 
+EXTRA_SUBDIRS = bda dshow
+SUBDIRS = dvb mms cdda rtsp rtmp v4l2 vcd vcdx screen
+DIST_SUBDIRS = $(EXTRA_SUBDIRS) $(SUBDIRS)
+
+if HAVE_WIN32
+SUBDIRS += bda dshow
+endif
+
 SOURCES_access_file = file.c
 SOURCES_access_mmap = mmap.c
 SOURCES_access_directory = directory.c