* src/Makefile.am: made the dist rule independent of --enable-libtool.

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index b1936d6cfa20b62db467c5b7e7cd61d4bded9091..98ee7ff0995b6cbfdcf33859a618c65481b091a1 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
@@ -77,6 +77,7 @@ HEADERS_include = \
        ../include/vlc_httpd.h \
        ../include/vlc_tls.h \
        ../include/vlc_md5.h \
+       ../include/vlc_devices.h \
        ../include/vlc_image.h \
        ../include/vlc_input.h \
        ../include/vlc_interaction.h \
@@ -89,6 +90,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 +112,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
 ###############################################################################
@@ -135,18 +128,17 @@ if USE_LIBTOOL
                        ../modules/*.a) echo $$c ;; \
                esac ; \
        done | \
-       sed -e 's/^\(.*\)\/\([^\/]*\)\.a$$/cd \1 \&\& $(MAKE) \2_builtin.la/g' | \
+       sed -e 's,^\(.*\)/\([^/]*\)\.a$$,cd \1 \&\& $(MAKE) \2_builtin.la,g' | \
        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
+       sed -e 's,^\(.*\)/\([^/]*\)\.a$$,cd \1 \&\& $(MAKE) \2,g' | \
+       while read cmd; do echo $$cmd.a; eval "($$cmd.a)" || exit $$? ; done
 endif
        touch $@
 
@@ -155,21 +147,17 @@ 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/\(modules\/[^ ]*\)\.a /\1_builtin.la /g'` \
-               -avoid-version -no-undefined
+               -avoid-version -no-undefined -shrext $(LIBEXT).0d
 libvlc_la_DEPENDENCIES = stamp-builtins
 
 
@@ -197,9 +185,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
@@ -263,13 +248,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 \
@@ -320,6 +308,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 \
@@ -334,7 +323,7 @@ SOURCES_libvlc_common = \
        misc/vlm.c \
        misc/xml.c \
        misc/hashtables.c \
-       misc/version.c \
+       misc/devices.c \
        extras/libc.c \
        control/core.c \
        control/playlist.c \
@@ -360,6 +349,11 @@ SOURCES_libvlc = \
        $(NULL)
 
 if !USE_LIBTOOL
+if !BUILD_SHARED
+SOURCES_libvlc += misc/version.c
+CLEANFILES += misc/version.c
+endif
+
 # Install shared libvlc
 install-exec-local:
        test -z "$(DATA_noinst_libvlc)" || $(INSTALL_PROGRAM) "$(DATA_noinst_libvlc)" "$(DESTDIR)$(libdir)"
@@ -369,6 +363,9 @@ uninstall-local:
        test -z "$(DATA_noinst_libvlc)" || rm -f "$(DESTDIR)$(libdir)/$(DATA_noinst_libvlc)"
 endif
 
+misc/version.c: FORCE
+       $(TOOLBOX) --update-version
+
 ###############################################################################
 # Stamp rules
 ###############################################################################
@@ -381,7 +378,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`
@@ -389,5 +386,10 @@ 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
 
+FORCE: