* modules/demux/mpeg/m4v.c: wait until we get p_extra from the packetizer before...

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 13be0f623d7fb4a78312fdb66208c4ae9f43f34c..89f0b0eb2a9c78375678d3b883ecf51721360eae 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,14 +2,16 @@
 # Automake targets and declarations
 ###############################################################################
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 NULL =
 SUBDIRS =
 
 EXTRA_DIST = extras/COPYING misc/modules_builtin.h.in
 
-BUILT_SOURCES = $(DISTCLEANFILES) $(CLEANFILES) misc/version.c
+BUILT_SOURCES = $(DISTCLEANFILES) $(CLEANFILES)
 DISTCLEANFILES = stamp-api
-CLEANFILES = misc/modules_builtin.h stamp-version
+CLEANFILES = misc/modules_builtin.h
 MOSTLYCLEANFILES = $(DATA_noinst_libvlc) stamp-builtins
 
 TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox
@@ -87,10 +89,12 @@ HEADERS_include = \
        ../include/vlc_playlist.h \
        ../include/vlc_spu.h \
        ../include/vlc_stream.h \
+       ../include/vlc_strings.h \
        ../include/vlc_symbols.h \
        ../include/vlc_threads_funcs.h \
        ../include/vlc_threads.h \
        ../include/vlc_update.h \
+       ../include/vlc_url.h \
        ../include/vlc_video.h \
        ../include/vlc_vlm.h \
        ../include/vlc_vod.h \
@@ -107,15 +111,6 @@ misc/modules_builtin.h: Makefile misc/modules_builtin.h.in ../vlc-config
 
 misc/modules.c: misc/modules_builtin.h
 
-misc/version.c:
-       $(TOOLBOX) --update-version
-
-stamp-version: misc/version.c
-       $(TOOLBOX) --update-version
-       touch $@
-
-.PHONY: stamp-version
-
 ###############################################################################
 # Building builtin modules
 ###############################################################################
@@ -136,14 +131,13 @@ if USE_LIBTOOL
        while read cmd; do echo $$cmd; eval "($$cmd)" || exit $$? ; done
 endif
 if BUILD_SHARED
-       @if test "$(pic)" = "pic"; then ext="_pic.a"; else ext=".a"; fi ; \
-       for c in `$(VLC_CONFIG) --libs builtin`; do \
+       @for c in `$(VLC_CONFIG) --libs builtin`; do \
                case $$c in \
                        ../modules/*.a) echo $$c ;; \
                esac ; \
        done | \
        sed -e 's/^\(.*\)\/\([^\/]*\)\.a$$/cd \1 \&\& $(MAKE) \2/g' | \
-       while read cmd; do echo $$cmd$$ext; eval "($$cmd$$ext)" || exit $$? ; done
+       while read cmd; do echo $$cmd.a; eval "($$cmd.a)" || exit $$? ; done
 endif
        touch $@
 
@@ -152,20 +146,16 @@ endif
 ###############################################################################
 
 libvlc_a_SOURCES = $(SOURCES_libvlc)
-libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
-libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
-libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc`
-
-libvlc_pic_a_SOURCES = $(SOURCES_libvlc)
-libvlc_pic_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc pic`
-libvlc_pic_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic`
-libvlc_pic_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc pic`
+libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc $(pic)`
+libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc $(pic)`
+libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc $(pic)`
 
 libvlc_la_SOURCES = $(SOURCES_libvlc)
+libvlc_la_LIBADD = $(INCLUDED_LIBINTL)
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
 libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc`
-libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin|sed -e 's/\.a /_builtin.la /g'` \
+libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin|sed -e 's/\(modules\/[^ ]*\)\.a /\1_builtin.la /g'` \
                -avoid-version -no-undefined
 libvlc_la_DEPENDENCIES = stamp-builtins
 
@@ -194,9 +184,6 @@ if USE_LIBTOOL
 lib_LTLIBRARIES = libvlc.la
 else
 lib_LIBRARIES = libvlc.a
-if BUILD_PIC
-lib_LIBRARIES += libvlc_pic.a
-endif
 endif
 
 if HAVE_WIN32
@@ -204,6 +191,8 @@ if BUILD_SHARED
 DATA_noinst_libvlc = libvlc$(LIBEXT)
 endif
 
+libvlc.dll.a: libvlc$(LIBEXT)
+
 libvlc$(LIBEXT): $(OBJECTS_libvlc_so) stamp-builtins
        @ldfl="`$(VLC_CONFIG) --libs plugin vlc builtin $(pic)` $(INCLUDED_LIBINTL)" ; \
        case `$(VLC_CONFIG) --linkage vlc builtin` in \
@@ -258,13 +247,16 @@ SOURCES_libvlc_common = \
        interface/interface.c \
        interface/intf_eject.c \
        interface/interaction.c \
-       playlist/playlist.c \
+       playlist/thread.c \
+       playlist/control.c \
+       playlist/engine.c \
        playlist/sort.c \
        playlist/loadsave.c \
-       playlist/view.c \
+       playlist/tree.c \
        playlist/item.c \
-       playlist/item-ext.c \
+       playlist/search.c \
        playlist/services_discovery.c \
+       input/item.c \
        input/access.c \
        input/clock.c \
        input/control.c \
@@ -288,7 +280,7 @@ SOURCES_libvlc_common = \
        audio_output/common.c \
        audio_output/dec.c \
        audio_output/filters.c \
-       audio_output/ainput.c \
+       audio_output/input.c \
        audio_output/mixer.c \
        audio_output/output.c \
        audio_output/intf.c \
@@ -302,6 +294,7 @@ SOURCES_libvlc_common = \
        network/acl.c \
        network/getaddrinfo.c \
        network/io.c \
+       network/error.c \
        network/tcp.c \
        network/udp.c \
        network/httpd.c \
@@ -314,6 +307,7 @@ SOURCES_libvlc_common = \
        misc/modules.c \
        misc/threads.c \
        misc/stats.c \
+       misc/strings.c \
        misc/unicode.c \
        misc/cpu.c \
        misc/configuration.c \
@@ -328,14 +322,13 @@ SOURCES_libvlc_common = \
        misc/vlm.c \
        misc/xml.c \
        misc/hashtables.c \
-       misc/version.c \
        extras/libc.c \
-       control/libvlc_core.c \
-       control/libvlc_playlist.c \
-       control/libvlc_vlm.c \
-       control/libvlc_input.c \
-       control/libvlc_video.c \
-       control/libvlc_audio.c \
+       control/core.c \
+       control/playlist.c \
+       control/vlm.c \
+       control/input.c \
+       control/video.c \
+       control/audio.c \
        control/mediacontrol_core.c \
        control/mediacontrol_util.c \
        control/mediacontrol_audio_video.c \
@@ -353,7 +346,18 @@ SOURCES_libvlc = \
        $(OPT_SOURCES_libvlc_getopt) \
        $(NULL)
 
+
 if !USE_LIBTOOL
+if !BUILD_SHARED
+SOURCES_libvlc += misc/version.c
+CLEANFILES += misc/version.c
+
+misc/version.c: FORCE
+       $(TOOLBOX) --update-version
+FORCE:
+
+endif
+
 # Install shared libvlc
 install-exec-local:
        test -z "$(DATA_noinst_libvlc)" || $(INSTALL_PROGRAM) "$(DATA_noinst_libvlc)" "$(DESTDIR)$(libdir)"
@@ -371,3 +375,21 @@ stamp-api: Makefile.in $(HEADERS_include) ../vlc-api.pl
          top_srcdir="$(top_srcdir)" perl $(top_srcdir)/vlc-api.pl
        touch stamp-api
 
+###############################################################################
+# Unit/regression test
+###############################################################################
+if USE_LIBTOOL
+check_PROGRAMS = test_i18n_atof test_url
+TESTS = $(check_PROGRAMS)
+
+CFLAGS_tests = `$(VLC_CONFIG) --cflags vlc`
+
+test_i18n_atof_SOURCES = test/i18n_atof.c
+test_i18n_atof_LDADD = libvlc.la
+test_i18n_atof_CFLAGS = $(CFLAGS_tests)
+
+test_url_SOURCES = test/url.c
+test_url_LDADD = libvlc.la
+test_url_CFLAGS = $(CFLAGS_tests)
+endif
+