Merge back branch 0.8.6-playlist-vlm to trunk.

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index d927e57f3a19fe3c1b5a91658705e4e39a000ef9..8bfaa552ed4ceb7498aa14e68ae0a1c001aac70e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@ EXTRA_DIST = extras/COPYING misc/modules_builtin.h.in
 
 BUILT_SOURCES = $(DISTCLEANFILES) $(CLEANFILES)
 DISTCLEANFILES = stamp-api
-CLEANFILES = misc/modules_builtin.h stamp-version misc/version.c
+CLEANFILES = misc/modules_builtin.h
 MOSTLYCLEANFILES = $(DATA_noinst_libvlc) stamp-builtins
 
 TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox
@@ -89,6 +89,7 @@ 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 \
@@ -110,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
 ###############################################################################
@@ -165,7 +157,7 @@ libvlc_pic_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic`
 libvlc_pic_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc pic`
 
 libvlc_la_SOURCES = $(SOURCES_libvlc)
-libvlc_la_LIBADD = $(INCLUDED_LTLIBINTL)
+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`
@@ -264,13 +256,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 \
@@ -321,6 +316,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 \
@@ -335,7 +331,6 @@ SOURCES_libvlc_common = \
        misc/vlm.c \
        misc/xml.c \
        misc/hashtables.c \
-       misc/version.c \
        extras/libc.c \
        control/core.c \
        control/playlist.c \
@@ -360,7 +355,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)"
@@ -382,7 +388,7 @@ stamp-api: Makefile.in $(HEADERS_include) ../vlc-api.pl
 # Unit/regression test
 ###############################################################################
 if USE_LIBTOOL
-check_PROGRAMS = test_i18n_atof
+check_PROGRAMS = test_i18n_atof test_url
 TESTS = $(check_PROGRAMS)
 
 CFLAGS_tests = `$(VLC_CONFIG) --cflags vlc`
@@ -390,5 +396,9 @@ 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