Commit 7849b249 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

More avoidable directories

parent 4ebc6479
...@@ -9,10 +9,18 @@ ...@@ -9,10 +9,18 @@
# - libs/* are needed by modules # - libs/* are needed by modules
EXTRA_SUBDIRS = m4 extras/package/ipkg \ EXTRA_SUBDIRS = m4 extras/package/ipkg \
bindings/python \ bindings/python \
libs/loader libs/srtp \
projects/mozilla projects/activex projects/mozilla projects/activex
SUBDIRS = po libs/loader libs/srtp src modules share doc test
DIST_SUBDIRS = $(SUBDIRS) $(EXTRA_SUBDIRS) 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 if BUILD_MOZILLA
SUBDIRS += projects/mozilla SUBDIRS += projects/mozilla
endif endif
......
...@@ -9,9 +9,7 @@ ...@@ -9,9 +9,7 @@
# by their respective owner(s). # by their respective owner(s).
# #
if LOADER
noinst_LTLIBRARIES = libloader.la noinst_LTLIBRARIES = libloader.la
endif
# TODO: real check for vsscanf() and <sys/mmap.h> # TODO: real check for vsscanf() and <sys/mmap.h>
AM_CPPFLAGS = -D__WINE__ -DHAVE_SYS_MMAN_H=1 -DHAVE_VSSCANF=1 \ AM_CPPFLAGS = -D__WINE__ -DHAVE_SYS_MMAN_H=1 -DHAVE_VSSCANF=1 \
......
...@@ -25,11 +25,9 @@ endif ...@@ -25,11 +25,9 @@ endif
noinst_HEADERS = srtp.h noinst_HEADERS = srtp.h
EXTRA_PROGRAMS = srtp EXTRA_PROGRAMS = srtp
if HAVE_LIBGCRYPT
noinst_LTLIBRARIES = libvlc_srtp.la noinst_LTLIBRARIES = libvlc_srtp.la
check_PROGRAMS = test-aes test-recv check_PROGRAMS = test-aes test-recv
TESTS = $(check_PROGRAMS) TESTS = $(check_PROGRAMS)
endif
libvlc_srtp_la_SOURCES = srtp.c libvlc_srtp_la_SOURCES = srtp.c
srtp_SOURCES = recv.c srtp_SOURCES = recv.c
......
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. # 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 # Moreover Libtool should default tag to CC when none is specified but
# obviously does not. Here is a fix for that. # obviously does not. Here is a fix for that.
LIBTOOL=@LIBTOOL@ --tag=CC 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_file = file.c
SOURCES_access_mmap = mmap.c SOURCES_access_mmap = mmap.c
SOURCES_access_directory = directory.c SOURCES_access_directory = directory.c
......
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