[vlc-devel] commit: More avoidable directories ( Rémi Denis-Courmont )
git version control
git at videolan.org
Sun May 4 15:02:41 CEST 2008
vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Sun May 4 15:51:15 2008 +0300| [7849b2496116224c43b78a09a463c5d57033c535]
More avoidable directories
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7849b2496116224c43b78a09a463c5d57033c535
---
Makefile.am | 10 +++++++++-
libs/loader/Makefile.am | 2 --
libs/srtp/Makefile.am | 2 --
modules/access/Modules.am | 9 ++++++++-
4 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 2f12b66..0ffc515 100644
--- 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 f211c2f..2e7c7f9 100644
--- 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 31b7493..901003c 100644
--- 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 5d76ae0..349bd6d 100644
--- 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
More information about the vlc-devel
mailing list