X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=eba48f23da269598e8571306833ddd7719ea3ad5;hb=fd964450e1eba43b68adbb82a2f684c460f93700;hp=bc8ce3774849cf69ea763858f3c4c6db492826d4;hpb=e73624fd4d2fd111b92a2b20ce91c24bbc90e958;p=vlc

diff --git a/Makefile.am b/Makefile.am
index bc8ce37748..eba48f23da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,7 +54,10 @@ BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean)
 
 SUFFIXES = 
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \
+DISTCHECK_CONFIGURE_FLAGS = \
+	--enable-fast-install \
+	--disable-dbus \
+	--disable-dvd --disable-mad --disable-libmpeg2 \
 	--disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 \
 	--disable-fribidi --disable-glx
 
@@ -69,6 +72,7 @@ AUTOMAKE_OPTIONS = \
 
 ChangeLog: Makefile.am
 	rm -f -- "$@"
+	cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs
 	ln -sf doc/ChangeLog-2008 "$@"
 
 ###############################################################################
@@ -100,9 +104,6 @@ EXTRA_DIST += \
 	extras/package/macosx/Resources/English.lproj/Extended.nib/classes.nib \
 	extras/package/macosx/Resources/English.lproj/Extended.nib/info.nib \
 	extras/package/macosx/Resources/English.lproj/Extended.nib/keyedobjects.nib \
-	extras/package/macosx/Resources/English.lproj/SFilters.nib/classes.nib \
-	extras/package/macosx/Resources/English.lproj/SFilters.nib/info.nib \
-	extras/package/macosx/Resources/English.lproj/SFilters.nib/keyedobjects.nib \
 	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 \
@@ -265,7 +266,8 @@ EXTRA_DIST += \
 	extras/package/macosx/eyetvplugin/eyetvplugin.h \
 	extras/package/macosx/eyetvplugin/English.lproj/InfoPlist.strings \
 	extras/package/macosx/eyetvplugin/eyetvplugin.xcodeproj/project.pbxproj \
-	extras/package/macosx/README.MacOSX.rtf
+	extras/package/macosx/README.MacOSX.rtf \
+	extras/package/macosx/Info.plist
 
 
 ###############################################################################
@@ -348,7 +350,7 @@ endif
 
 ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc
 bin_SCRIPTS = $(ALIASES)
-CLEANFILES += $(ALIASES)
+CLEANFILES += $(ALIASES) $(noinst_SCRIPTS)
 EXTRA_SCRIPTS = $(ALL_ALIASES)
 
 dist_noinst_SCRIPTS += make-alias
@@ -398,7 +400,7 @@ VLC-release.app: vlc
 	rm -Rf "$(top_builddir)/tmp"
 	mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
 	rm -Rf $(top_builddir)/VLC-release.app
-	for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
+	for i in vlc.xcodeproj Resources README.MacOSX.rtf Info.plist; do \
 	  cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
 	done
 	for i in AUTHORS COPYING THANKS; do \
@@ -445,8 +447,6 @@ VLC-release.app: vlc
 	    extended.m \
 	    bookmarks.h \
 	    bookmarks.m \
-	    sfilters.h \
-	    sfilters.m \
 	    update.h \
 	    update.m \
 	    interaction.h \
@@ -554,10 +554,11 @@ VLC-release.app: vlc
 # This is just for development purposes. 
 # The resulting VLC.app will only in this tree.
 VLC.app: vlc 
+	(cd src && make install)
 	rm -Rf $(top_builddir)/tmp
 	mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
 	rm -Rf $(top_builddir)/VLC.app
-	for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
+	for i in vlc.xcodeproj Resources README.MacOSX.rtf Info.plist; do \
 	  cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
 	done
 	for i in AUTHORS COPYING THANKS; do \
@@ -604,8 +605,6 @@ VLC.app: vlc
 	    extended.m \
 	    bookmarks.h \
 	    bookmarks.m \
-	    sfilters.h \
-	    sfilters.m \
 	    update.h \
 	    update.m \
 	    interaction.h \
@@ -624,8 +623,9 @@ VLC.app: vlc
 	          $(top_builddir)/VLC.app
 	rm -Rf $(top_builddir)/tmp
 	$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
-	ln -sf $(top_builddir)/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC
-	ln -sf $(top_builddir)/vlc $(top_builddir)/VLC.app/Contents/MacOS/clivlc
+	touch $(top_builddir)/VLC.app/Contents/MacOS/VLC
+	chmod +x $(top_builddir)/VLC.app/Contents/MacOS/VLC
+	$(INSTALL) $(top_builddir)/src/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC
 	$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules
 	find modules/ -name '*_plugin$(LIBEXT)' | while read i; do \
 	  if test -n "$$i" ; \
@@ -653,6 +653,7 @@ VLC.app: vlc
 # the same setup as the maintaner(s).
 #
 
+#Win-common if for win32 and wince
 package-win-common:
 # Check that tmp isn't in the way
 	@if test -e "$(top_builddir)/vlc-$(VERSION)"; then \
@@ -663,25 +664,65 @@ package-win-common:
 	fi
 
 # Copy relevant files
+# Copy executables and libs
 	cp "$(top_builddir)/src/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-$(VERSION)/"
 	cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(top_builddir)/vlc-$(VERSION)/"
 	cp "$(top_builddir)/src/.libs/libvlccore$(LIBEXT)" "vlc-$(VERSION)/"
 	cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-$(VERSION)/"
 
+# Copy Text files
 	for file in AUTHORS MAINTAINERS THANKS ; \
 	  do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-$(VERSION)/$${file}.txt" ; done;
 	for file in NEWS COPYING README; \
 	  do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-$(VERSION)/$${file}.txt"; done
 	unix2dos "$(top_builddir)/vlc-$(VERSION)/"*.txt
 
-	mkdir -p $(top_builddir)/vlc-$(VERSION)/share/locale
+# Necessary icons
+	cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-$(VERSION)/
+
+# Copy the locales
+	mkdir -p $(top_builddir)/vlc-$(VERSION)/locale
 	cat $(top_srcdir)/po/LINGUAS | while read i; do \
-	  mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/locale/$${i}/LC_MESSAGES" ; \
+	  mkdir -p "$(top_builddir)/vlc-$(VERSION)/locale/$${i}/LC_MESSAGES" ; \
 	  cp "$(srcdir)/po/$${i}.gmo" \
-	    "$(top_builddir)/vlc-$(VERSION)/share/locale/$${i}/LC_MESSAGES/vlc.mo" \
+	    "$(top_builddir)/vlc-$(VERSION)/locale/$${i}/LC_MESSAGES/vlc.mo" \
             || true ; \
 	done
 
+#  Mozilla plugin
+if BUILD_MOZILLA
+	mkdir -p "$(top_builddir)/vlc-$(VERSION)/mozilla"
+	cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/mozilla/
+endif
+
+# ActiveX plugin
+if BUILD_ACTIVEX
+	mkdir -p "$(top_builddir)/vlc-$(VERSION)/activex"
+	cp $(srcdir)/projects/activex/README.TXT  $(top_builddir)/vlc-$(VERSION)/activex/
+	cp $(srcdir)/projects/activex/test.html  $(top_builddir)/vlc-$(VERSION)/activex/
+	unix2dos $(top_builddir)/vlc-$(VERSION)/activex/*
+
+	cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/activex/
+endif
+
+# Rebase all those DLLs to speed up loading (need cygwin rebase)
+	if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \
+		find $(top_builddir)/vlc-$(VERSION) -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \
+	fi
+
+package-win32-base-debug: package-win-common
+# Copy relevant files
+# Script installer
+	cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(top_builddir)/vlc-$(VERSION)/"
+
+# Plugins
+	mkdir -p "$(top_builddir)/vlc-$(VERSION)/plugins"
+	find modules/ -name '*_plugin$(LIBEXT)' | while read i; do \
+	  if test -n "$$i" ; then \
+	    $(INSTALL) "$$i" "vlc-$(VERSION)/plugins/" ; \
+	  fi ; done
+
+# Copy the lua scripts (HTTP)
 if BUILD_LUA
 	mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/lua/http/images"
 	mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/lua/http/requests"
@@ -707,6 +748,27 @@ if BUILD_LUA
 	unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/requests/readme.txt
 endif
 
+if BUILD_LUA
+#Lua Scripts
+	$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/playlist
+	for i in $(srcdir)/share/lua/playlist/*.* ; do \
+	  $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/playlist/`basename $${i}` ; \
+	done
+	$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/meta
+	for i in $(srcdir)/share/lua/meta/*.* ; do \
+	  $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/meta/`basename $${i}` ; \
+	done
+	$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf
+	for i in $(srcdir)/share/lua/intf/*.* ; do \
+	  $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/intf/`basename $${i}` ; \
+	done
+	$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules
+	for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
+	  $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules/`basename $${i}` ; \
+	done
+endif
+
+# Copy the http files
 if BUILD_HTTPD
 	mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/http/images"
 	mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/http/requests"
@@ -746,112 +808,70 @@ if BUILD_HTTPD
 	cp $(srcdir)/share/http/old/admin/.access $(top_builddir)/vlc-$(VERSION)/share/http/old/admin/
 endif
 
-	cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-$(VERSION)/
-
-if BUILD_MOZILLA
-	mkdir -p "$(top_builddir)/vlc-$(VERSION)/mozilla"
-	cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/mozilla/
-endif
-
-if BUILD_ACTIVEX
-	mkdir -p "$(top_builddir)/vlc-$(VERSION)/activex"
-	cp $(srcdir)/projects/activex/README.TXT  $(top_builddir)/vlc-$(VERSION)/activex/
-	cp $(srcdir)/projects/activex/test.html  $(top_builddir)/vlc-$(VERSION)/activex/
-	unix2dos $(top_builddir)/vlc-$(VERSION)/activex/*
-
-	cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/activex/
-endif
-# Rebase all those DLLs to speed up loading (need cygwin rebase)
-	if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \
-		find $(top_builddir)/vlc-$(VERSION) -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \
-	fi
-
-package-win-common-strip:
-	$(STRIP) "$(top_builddir)/vlc-$(VERSION)/vlc$(EXEEXT)"
-	$(STRIP) "vlc-$(VERSION)/libvlccore$(LIBEXT)"
-	$(STRIP) "vlc-$(VERSION)/libvlc$(LIBEXT)"
-if BUILD_MOZILLA
-	$(STRIP) $(top_builddir)/vlc-$(VERSION)/mozilla/npvlc$(LIBEXT);
-endif
-if BUILD_ACTIVEX
-	$(STRIP) $(top_builddir)/vlc-$(VERSION)/activex/axvlc$(LIBEXT);
-endif
-
-package-win32-base-debug: package-win-common
-# Copy relevant files
-# Script installer
-	cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(top_builddir)/vlc-$(VERSION)/"
-
-# Plugins
-	mkdir -p "$(top_builddir)/vlc-$(VERSION)/plugins"
-	find modules/ -name '*_plugin$(LIBEXT)' | while read i; do \
-	  if test -n "$$i" ; then \
-	    $(INSTALL) "$$i" "vlc-$(VERSION)/plugins/" ; \
-	  fi ; done
-
 if BUILD_SKINS
 # Skins
 	mkdir -p $(top_builddir)/vlc-$(VERSION)/skins/fonts
 	for i in $(srcdir)/share/skins2/fonts/*.*; do \
-	  cp -- "$$i" $(top_builddir)/vlc-$(VERSION)/share/skins/fonts/ || true ; \
+	  cp -- "$$i" $(top_builddir)/vlc-$(VERSION)/skins/fonts/ || true ; \
 	done
 	for i in $(srcdir)/share/skins2/*.*; do \
-	  cp -- "$$i" $(top_builddir)/vlc-$(VERSION)/share/skins/ || true ; \
-	done
-endif
-
-if BUILD_LUA
-#Lua Scripts
-	$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/playlist
-	for i in $(srcdir)/share/lua/playlist/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/playlist/`basename $${i}` ; \
-	done
-	$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/meta
-	for i in $(srcdir)/share/lua/meta/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/meta/`basename $${i}` ; \
-	done
-	$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf
-	for i in $(srcdir)/share/lua/intf/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/intf/`basename $${i}` ; \
-	done
-	$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules
-	for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules/`basename $${i}` ; \
+	  cp -- "$$i" $(top_builddir)/vlc-$(VERSION)/skins/ || true ; \
 	done
 endif
 
 if BUILD_OSDMENU
 #OSD Menu
-	mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/osdmenu"
-	cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-$(VERSION)/share/osdmenu"
+	mkdir -p "$(top_builddir)/vlc-$(VERSION)/osdmenu"
+	cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-$(VERSION)/osdmenu"
 	for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume minimal;do \
-		mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/osdmenu/$$dir"; \
+		mkdir -p "$(top_builddir)/vlc-$(VERSION)/osdmenu/$$dir"; \
 		for file in $(srcdir)/share/osdmenu/$${dir}/* ;do \
-			 cp -- "$$file" "$(top_builddir)/vlc-$(VERSION)/share/osdmenu/$$dir"; \
+			 cp -- "$$file" "$(top_builddir)/vlc-$(VERSION)/osdmenu/$$dir"; \
 		done; \
 	done
-	unix2dos $(top_builddir)/vlc-$(VERSION)/share/osdmenu/*.cfg;
-	for file in $(top_builddir)/vlc-$(VERSION)/share/osdmenu/*.cfg; do \
+	unix2dos $(top_builddir)/vlc-$(VERSION)/osdmenu/*.cfg;
+	for file in $(top_builddir)/vlc-$(VERSION)/osdmenu/*.cfg; do \
 		sed 's%share/osdmenu%osdmenu%g' "$$file" > "$$file.tmp" || exit $$? ; \
 		sed 's%/%\\%g' "$$file.tmp" > "$$file" || exit$$? ; \
 		rm -f -- "$$file.tmp"; \
 	done
 endif
 
-package-win32-base: package-win32-base-debug package-win-common-strip
+# SDK
+	mkdir -p "$(top_builddir)/vlc-$(VERSION)/sdk.tmp"
+	mkdir -p "$(top_builddir)/vlc-$(VERSION)/sdk"
+	d=$$(pwd) && \
+	cd src && \
+	make install DESTDIR="$$d/vlc-$(VERSION)/sdk.tmp"
+	cd vlc-$(VERSION) && mv sdk.tmp/$(prefix)/* sdk/
+	find vlc-$(VERSION)/sdk.tmp -type d | sort -r | xargs rmdir
+	rm -Rf vlc-$(VERSION)/sdk/bin
+
+package-win-common-strip: package-win32-base-debug
+	$(STRIP) "vlc-$(VERSION)/vlc$(EXEEXT)"
+	$(STRIP) "vlc-$(VERSION)/libvlccore$(LIBEXT)"
+	$(STRIP) "vlc-$(VERSION)/libvlc$(LIBEXT)"
+if BUILD_MOZILLA
+	$(STRIP) "vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)"
+endif
+if BUILD_ACTIVEX
+	$(STRIP) "vlc-$(VERSION)/activex/axvlc$(LIBEXT)"
+endif
+
+package-win32-base: package-win-common-strip
 	for i in "" $(top_builddir)/vlc-$(VERSION)/plugins/*$(LIBEXT) ; \
 	  do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
 
 package-win32-base-exe: package-win32-base
 # Create package
 	if makensis -VERSION >/dev/null 2>&1; then \
-	    MAKENSIS="makensis -DVERSION=$(VERSION)"; \
+	    MAKENSIS="makensis"; \
 	elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
-	    MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis /DVERSION=$(VERSION)"; \
+	    MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis)"; \
 	elif [ -x "$(PROGRAMFILES)/NSIS/makensis" ]; then \
-	    MAKENSIS="$(PROGRAMFILES)/NSIS/makensis -DVERSION=$(VERSION)"; \
+	    MAKENSIS="$(PROGRAMFILES)/NSIS/makensis"; \
 	elif wine --version >/dev/null 2>&1; then \
-	    MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe /DVERSION=$(VERSION)"; \
+	    MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe"; \
 	else \
 	    echo 'Error: cannot locate makensis tool'; exit 1; \
 	fi; \
@@ -862,10 +882,11 @@ package-win32-base-exe-cygwin: package-win32-base-exe
 
 package-win32-base-exe-linux:
 # Create package
-	makensis -DVERSION=$(VERSION) $(top_builddir)/vlc-$(VERSION)/vlc.win32.nsi
+	makensis $(top_builddir)/vlc-$(VERSION)/vlc.win32.nsi
 
 package-win32-base-zip: package-win32-base
 # Create package 
+	rm -f -- vlc-$(VERSION)-win32.zip
 	zip -r -9 vlc-$(VERSION)-win32.zip vlc-$(VERSION)
 
 package-win32-base-7zip: package-win32-base
@@ -1112,6 +1133,9 @@ update-po:
 	    | 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