Default to rebase on submodule updates to prevent losing local changes.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a4624eeab46e008a5f6c0a48c75f852d967e11da..b5b66ea9d518cbd87df103d05b3d6ccda1540e07 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -697,12 +697,20 @@ package-win-common:
        else \
          echo "OK."; mkdir -p "$(win32_destdir)"; \
        fi
+# Same for debug symbols dir
+       @if test -e "$(win32_debugdir)"; then \
+         echo "Error: please remove $(win32_debugdir), it is in the way"; \
+         false; \
+       else \
+         echo "OK."; mkdir -p "$(win32_debugdir)"; \
+       fi
 
 # Copy relevant files
-# Copy executables and libs
+# Copy executables, major libs+manifests
        cp "$(top_builddir)/bin/.libs/vlc$(EXEEXT)" "$(win32_destdir)/"
+       cp "$(top_builddir)/bin/.libs/vlc-cache-gen$(EXEEXT)" "$(win32_destdir)/"
        cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(win32_destdir)/"
-               cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_destdir)/"
+       cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_destdir)/"
        cp "$(top_builddir)/src/.libs/libvlccore$(LIBEXT)" "$(win32_destdir)/"
        cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "$(win32_destdir)/"
 
@@ -785,9 +793,6 @@ package-win32-base-debug: package-win-common
            $(INSTALL) "$$i" "vlc-$(VERSION)/plugins/" ; \
          fi ; done
 
-# Contrib *.dll's
-#      cp $(CONTRIB_DIR)/lib/*.dll "vlc-$(VERSION)/" || true
-
 #Enable DEP and ASLR for all the binaries
 if USE_PEFLAGS
        find $(win32_destdir) -type f -name '*.dll' -print -o -name '*.exe' -print | while read i; do \
@@ -921,12 +926,6 @@ endif
 
 # Strip DLLs
 package-win-common-strip: package-win32-base-debug
-       @if test -e "$(win32_debugdir)"; then \
-         echo "Error: please remove $(win32_debugdir), it is in the way"; \
-         false; \
-       else \
-         echo "OK."; mkdir -p "$(win32_debugdir)"; \
-       fi
        for i in "" $(win32_destdir)/*$(LIBEXT) \
                    $(win32_destdir)/*$(EXEEXT) \
                    $(win32_destdir)/activex/*$(LIBEXT) \
@@ -978,36 +977,29 @@ package-win32-base-debug-7zip: package-win32-base-debug
 # Create package
        7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$(VERSION)-win32-debug.7z vlc-$(VERSION)
 
-package-win32-exe: package-win32-base package-win32-base-exe
-# Clean up
+package-win32-cleanup:
        rm -Rf $(win32_destdir)
+       rm -Rf $(win32_debugdir)
 
-package-win32-zip: package-win32-base-zip
-# Clean up
-       rm -Rf $(win32_destdir)
+package-win32-exe: package-win32-base package-win32-base-exe package-win32-cleanup
 
-package-win32-debug-zip: package-win32-base-debug-zip
-# Clean up
-       rm -Rf $(win32_destdir)
+package-win32-zip: package-win32-base-zip package-win32-cleanup
 
-package-win32-7zip: package-win32-base-7zip
-# Clean up
-       rm -Rf $(win32_destdir)
+package-win32-debug-zip: package-win32-base-debug-zip package-win32-cleanup
 
-package-win32-debug-7zip: package-win32-base-debug-7zip
-# Clean up
-       rm -Rf $(win32_destdir)
+package-win32-7zip: package-win32-base-7zip package-win32-cleanup
+
+package-win32-debug-7zip: package-win32-base-debug-7zip package-win32-cleanup
 
 package-win32-no-clean: package-win32-base-zip package-win32-base-7zip package-win32-base-exe 
 
-package-win32: package-win32-no-clean
-# Clean up
-       rm -Rf $(win32_destdir)
+package-win32: package-win32-no-clean package-win32-cleanup
 
-package-win32-debug: package-win32-base-debug-zip package-win32-base-debug-7zip
-# Clean up
-       rm -Rf $(win32_destdir)
+package-win32-debug: package-win32-base-debug-zip package-win32-base-debug-7zip package-win32-cleanup
 
+#######
+# WinCE
+#######
 package-wince-base: package-win-common-strip
 
 package-wince-base-zip: package-wince-base
@@ -1015,9 +1007,7 @@ package-wince-base-zip: package-wince-base
        rm -f -- vlc-$(VERSION)-wince.zip
        zip -r -9 vlc-$(VERSION)-wince.zip vlc-$(VERSION)
 
-package-wince: package-wince-base-zip
-# Clean up
-       rm -Rf $(win32_destdir)
+package-wince: package-wince-base-zip package-win32-cleanup
 
 
 #####################################################################