WinCE intf: remove VLC_Changeset

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 402803d96f37ccc80ea50406ee09413defbd97d5..e3a87d269d7a1926ed9db6d31ce93a30483b914d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@
 #  - libs/* are needed by modules
 BASE_SUBDIRS = po src bin modules share doc test
 EXTRA_SUBDIRS = m4 extras/package/ipkg \
-       libs/loader libs/srtp \
+       libs/loader libs/srtp libs/unzip \
        projects/mozilla projects/activex
 DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
 
@@ -20,6 +20,11 @@ endif
 if HAVE_LIBGCRYPT
 SUBDIRS += libs/srtp
 endif
+if HAVE_ZLIB
+if !HAVE_MINIZIP
+SUBDIRS += libs/unzip
+endif
+endif
 if BUILD_VLC
 SUBDIRS += bin
 endif
@@ -680,6 +685,9 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
 ## Win                                                                    ##
 ############################################################################
 win32_destdir=$(top_builddir)/vlc-$(VERSION)
+win32_debugdir=$(top_builddir)/symbols-$(VERSION)
+npvlc=vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)
+axvlc=vlc-$(VERSION)/activex/axvlc$(LIBEXT)
 win32_lua_destdir=$(win32_destdir)/lua
 win32_http_destdir=$(win32_destdir)/http
 
@@ -867,9 +875,9 @@ if BUILD_OSDMENU
 #OSD Menu
        mkdir -p "$(win32_destdir)/osdmenu"
        cp $(srcdir)/share/osdmenu/*.* "$(win32_destdir)/osdmenu"
-       for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume minimal;do \
+       for dir in default default/selected default/selection default/volume ;do \
                mkdir -p "$(win32_destdir)/osdmenu/$$dir"; \
-               for file in $(srcdir)/share/osdmenu/$${dir}/*.png ;do \
+               for file in $(srcdir)/share/osdmenu/$${dir}/*.png;do \
                         cp -- "$$file" "$(win32_destdir)/osdmenu/$$dir"; \
                done; \
        done
@@ -893,19 +901,42 @@ endif
 
 #strip exe and main dll
 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 "" vlc-$(VERSION)/*$(LIBEXT) ; \
-         do if test -n "$$i" ; then $(STRIP) "$$i" ; fi; done
+      do if test -n "$$i" ; then \
+      $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \
+      $(OBJCOPY) --strip-debug "$$i" ; \
+      $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \
+         mv "$$i.dbg" "$(win32_debugdir)"; \
+    fi; done
+
 if BUILD_MOZILLA
-       $(STRIP) "vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)"
+       $(OBJCOPY) --only-keep-debug "$(npvlc)" "$(npvlc).dbg"
+       $(OBJCOPY) --strip-debug "$(npvlc)"
+       $(OBJCOPY) --add-gnu-debuglink="$(npvlc).dbg" "$(npvlc)"
+       mv "$(npvlc).dbg" "$(win32_debugdir)"
 endif
 if BUILD_ACTIVEX
-       $(STRIP) "vlc-$(VERSION)/activex/axvlc$(LIBEXT)"
+       $(OBJCOPY) --only-keep-debug "$(axvlc)" "$(axvlc).dbg"
+       $(OBJCOPY) --strip-debug "$(axvlc)"
+       $(OBJCOPY) --add-gnu-debuglink="$(axvlc).dbg" "$(axvlc)"
+       mv "$(axvlc).dbg" "$(win32_debugdir)"
 endif
 
 #strip all plugins dll
 package-win32-base: package-win-common-strip
        for i in "" $(win32_destdir)/plugins/*$(LIBEXT) ; \
-         do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
+         do if test -n "$$i" ; then \
+         $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \
+         $(OBJCOPY) --strip-debug "$$i" ; \
+         $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \
+         mv "$$i.dbg" "$(win32_debugdir)"; \
+       fi ; done
 
 package-win32-base-exe: package-win32-base
 # Create package