X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=4224ba7a2ada87592c26685ccca7a959eeff288f;hb=4b26e4b50e940af583ccfa2844b79a477fb97206;hp=81beaddbf89c39abab49aa7977428193be08bbce;hpb=2f8dc66982aa63ce261047807c6b85abb0eaef9e;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 81beaddbf8..4224ba7a2a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,19 +7,24 @@
 # which have makefiles with distribution information.
 #  - src (libvlc) is nedeed by modules, mozilla and bindings
 #  - libs/* are needed by modules
-BASE_SUBDIRS = po src bin modules share doc test
+BASE_SUBDIRS = po compat 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)
 
-SUBDIRS = po src
+SUBDIRS = po compat src
 if LOADER
 SUBDIRS += libs/loader
 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
@@ -81,7 +86,7 @@ AUTOMAKE_OPTIONS = \
 ChangeLog: Makefile.am
 	rm -f -- "$@"
 	cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs
-	ln -sf doc/ChangeLog-2008 "$@"
+	ln -sf doc/ChangeLog-2009 "$@"
 
 ###############################################################################
 # MacOS X project
@@ -115,12 +120,12 @@ EXTRA_DIST += \
 	extras/package/macosx/Resources/English.lproj/Update.nib/classes.nib \
 	extras/package/macosx/Resources/English.lproj/Update.nib/info.nib \
 	extras/package/macosx/Resources/English.lproj/Update.nib/keyedobjects.nib \
-	extras/package/macosx/Resources/English.lproj/Interaction.nib/classes.nib \
-	extras/package/macosx/Resources/English.lproj/Interaction.nib/info.nib \
-	extras/package/macosx/Resources/English.lproj/Interaction.nib/keyedobjects.nib \
-	extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib \
-	extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/info.nib \
-	extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib \
+	extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/classes.nib \
+	extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/info.nib \
+	extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/keyedobjects.nib \
+	extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/classes.nib \
+	extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/info.nib \
+	extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/keyedobjects.nib \
 	extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \
 	extras/package/macosx/Resources/a52.icns \
 	extras/package/macosx/Resources/aac.icns \
@@ -267,7 +272,6 @@ EXTRA_DIST += \
 	extras/package/macosx/plugin/InstallerInfo.plist.in \
 	extras/package/macosx/plugin/InstallerDescription.plist \
 	extras/package/macosx/plugin/pbdevelopment.plist \
-	extras/package/macosx/plugin/English.lproj/InfoPlist.strings.in \
 	extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \
 	extras/package/macosx/eyetvplugin/Info.plist \
 	extras/package/macosx/eyetvplugin/eyetvplugin.c \
@@ -393,12 +397,8 @@ if BUILD_VLC
 noinst_SCRIPTS += vlc$(EXEEXT)
 endif
 
-vlc$(EXEEXT): Makefile.am
-	rm -f -- vlc vlc.tmp
-	echo '#! /bin/sh' > vlc.tmp
-	echo 'exec "$$(dirname "$$0")/bin/vlc-static$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp
-	chmod +x vlc.tmp
-	mv -f -- vlc.tmp vlc
+vlc$(EXEEXT):
+	ln -sf bin/vlc-static$(EXEEXT) vlc$(EXEEXT)
 
 if HAVE_DARWIN
 if BUILD_VLC
@@ -466,8 +466,8 @@ VLC-release.app: vlc
 	    bookmarks.m \
 	    update.h \
 	    update.m \
-	    interaction.h \
-	    interaction.m \
+	    coredialogs.h \
+	    coredialogs.m \
 	    embeddedwindow.h \
 	    embeddedwindow.m \
 	    fspanel.h \
@@ -575,7 +575,7 @@ VLC-release.app: vlc
 	find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \;
 
 # This is just for development purposes. 
-# The resulting VLC.app will only in this tree.
+# The resulting VLC.app will only run in this tree.
 VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.libs/libvlc.dylib
 	(cd src && make install)
 	rm -Rf $(top_builddir)/tmp
@@ -633,8 +633,8 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
 	    bookmarks.m \
 	    update.h \
 	    update.m \
-	    interaction.h \
-	    interaction.m \
+	    coredialogs.h \
+	    coredialogs.m \
 	    embeddedwindow.h \
 	    embeddedwindow.m \
 	    fspanel.h \
@@ -680,6 +680,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
 
@@ -709,7 +712,7 @@ package-win-common:
 	unix2dos "$(win32_destdir)/"*.txt || echo "WARNING: this shouldn't happen"
 
 # Necessary icons
-	cp $(srcdir)/share/vlc48x48.ico $(win32_destdir)/
+	cp $(srcdir)/share/vlc.ico $(win32_destdir)/
 
 # Copy the locales
 	mkdir -p $(win32_destdir)/locale
@@ -861,15 +864,17 @@ if BUILD_SKINS
 	for i in $(top_builddir)/share/skins2/*.*; do \
 	  cp -- "$$i" $(win32_destdir)/skins/ || true ; \
 	done
+	cp -- $(srcdir)/share/skins2/skin.catalog $(win32_destdir)/skins/ || true ;
+	cp -- $(srcdir)/share/skins2/skin.dtd $(win32_destdir)/skins/ || true ;
 endif
 
 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 +898,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
@@ -1180,37 +1208,12 @@ package-translations:
 
 ###############################################################################
 # PO translation files update
-# Generate po/POTFILES.in which lists all the files containing translatable
-# strings. Find all source files and remove the generated files
 ###############################################################################
 .PHONY: update-po
 
 update-po:
-	rm -f $(top_srcdir)/po/POTFILES.in
-	{ \
-	  cd $(top_srcdir) && \
-	  echo "# automatically created by make update-po" ; \
-	  echo "" ; \
-	  echo "# main sources" ; \
-	  find include src -name '*.[chm]' -o -name '*.[ch]pp' \
-	    | grep -v '\(misc/modules_\|src/misc/revision.c\|modules/builtin.h\|include/vlc_about.h\)' \
-	    | sort ; \
-	  echo "" ; \
-	  echo "# modules" ; \
-	  find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -name '*.ui' \
-	    | grep -v '\(\.moc\.\|gui/gtk2/\)' \
-	    | grep -vE 'qt4/ui/.*.h' \
-	    | grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \
-	    | grep -v 'gui/opie' \
-	    | grep -v 'wxwidgets' \
-	    | grep -v 'mux/rtp/' \
-	    | grep -v 'demux/rtpxiph.c' \
-	    | sort ; \
-	} > $(top_srcdir)/po/POTFILES.in
-	rm -f $(top_srcdir)/po/vlc.pot
 	cd po && $(MAKE) POTFILES vlc.pot update-po
 
-#cd po && $(MAKE) update-po
 
 ###############################################################################
 # Enforce Mac OS X deployment target environment variable