Backport of [11331]

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 58f743adcb530feb2ff5a1a8b8658313b1b1df58..897e588d3f54b93a53995d2ffbf87731f316e0fe 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -125,13 +125,13 @@ HEADERS_include_built = \
        include/vlc_symbols.h \
        $(NULL)
 
-include/vlc_symbols.h: Makefile $(HEADERS_include) vlc-config
-       srcdir=$(srcdir) $(srcdir)/toolbox --update-includes
-
-src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include) vlc-config
-       srcdir=$(srcdir) $(srcdir)/toolbox --update-includes
+# Common dependencies for these 3 files : Makefile vlc-config
+# Specific dependencies :
+#  include/vlc_symbols.h: $(HEADERS_include)
+#  src/misc/modules_plugin.h: src/misc/modules_plugin.h.in $(HEADERS_include)
+#  src/misc/modules_builtin.h: src/misc/modules_builtin.h.in
 
-src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in vlc-config
+include/vlc_symbols.h src/misc/modules_plugin.h src/misc/modules_builtin.h: Makefile $(HEADERS_include) vlc-config src/misc/modules_plugin.h.in src/misc/modules_builtin.h.in
        srcdir=$(srcdir) $(srcdir)/toolbox --update-includes
 
 # These dependencies are mandatory
@@ -417,15 +417,15 @@ bin_PROGRAMS = vlc
 
 vlc_SOURCES = src/vlc.c
 
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin`
-vlc_LDADD = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
-vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
-
 # Work around a bug in the arm-wince-pe linker
 if HAVE_WINCE
-vlc_LDFLAGS += lib/libvlc.a
+vlc_WORKAROUNDLDFLAGS = lib/libvlc.a
 endif
 
+vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin` $(vlc_WORKAROUNDLDFLAGS)
+vlc_LDADD = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
+vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
+
 # We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an
 # old automake-1.5 bug (automake/279).
 DEPENDENCIES_vlc = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)