libtool:

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 5822759ef0d20329558f2002336949f44d1a9eb7..2ff7226e59dc29456581c22a945e9ec4c7d313bc 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,9 +7,9 @@ SUBDIRS =
 
 EXTRA_DIST = extras/COPYING misc/modules_builtin.h.in
 
-BUILT_SOURCES = $(DISTCLEANFILES) $(CLEANFILES)
+BUILT_SOURCES = $(DISTCLEANFILES) $(CLEANFILES) misc/version.c
 DISTCLEANFILES = stamp-api
-CLEANFILES = misc/modules_builtin.h misc/version.c
+CLEANFILES = misc/modules_builtin.h stamp-version
 MOSTLYCLEANFILES = $(DATA_noinst_libvlc) stamp-builtins
 
 TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox
@@ -107,9 +107,15 @@ misc/modules_builtin.h: Makefile misc/modules_builtin.h.in ../vlc-config
 
 misc/modules.c: misc/modules_builtin.h
 
-misc/version.c: FORCE
+misc/version.c:
        $(TOOLBOX) --update-version
 
+stamp-version: misc/version.c
+       $(TOOLBOX) --update-version
+       touch $@
+
+.PHONY: stamp-version
+
 ###############################################################################
 # Building builtin modules
 ###############################################################################
@@ -159,7 +165,7 @@ libvlc_la_SOURCES = $(SOURCES_libvlc)
 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
 
@@ -365,7 +371,3 @@ stamp-api: Makefile.in $(HEADERS_include) ../vlc-api.pl
          top_srcdir="$(top_srcdir)" perl $(top_srcdir)/vlc-api.pl
        touch stamp-api
 
-###############################################################################
-# Force rule
-###############################################################################
-FORCE: