* modules/access/dvdnav.c: backport of #11306.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 98f7145b6fb0d6843c2527f29cfcef07a52090eb..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,7 +417,12 @@ bin_PROGRAMS = vlc
 
 vlc_SOURCES = src/vlc.c
 
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin`
+# Work around a bug in the arm-wince-pe linker
+if HAVE_WINCE
+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`
 
@@ -779,6 +784,10 @@ if BUILD_ACTIVEX
        cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ;
        $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT);
 endif
+# Rebase all those DLLs to speed up loading (need cygwin rebase)
+       if [ -x rebase ]; then \
+               find $(top_builddir)/vlc-${VERSION} -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \
+       fi
 
 package-win32-base-exe:
 # Create package
@@ -859,7 +868,7 @@ package-macosx:
        fi
 
 # Copy relevant files 
-       cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/tmp/"
+       cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/tmp/VLC.app"
        cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/
 
 # Create disk image