X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=44b4caee545b97a7c3dbe38f7603ac72c3a690ea;hb=52e494f47e019d73691bf999192ac918c93c21f6;hp=008954337743673157e1e63f706c9f50672cb888;hpb=35824733e305214dfada18dd6362cfa02a86dcd3;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 0089543377..44b4caee54 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@
 # which have makefiles with distribution information.
 #  - src (libvlc) is nedeed by modules, mozilla and bindings
 #  - libs/* are needed by modules
-BASE_SUBDIRS = po src modules share doc test
+BASE_SUBDIRS = po src bin modules share doc test
 EXTRA_SUBDIRS = m4 extras/package/ipkg \
 	libs/loader libs/srtp \
 	projects/mozilla projects/activex
@@ -20,6 +20,9 @@ endif
 if HAVE_LIBGCRYPT
 SUBDIRS += libs/srtp
 endif
+if BUILD_VLC
+SUBDIRS += bin
+endif
 SUBDIRS += modules share doc test
 if BUILD_MOZILLA
 SUBDIRS += projects/mozilla
@@ -39,7 +42,10 @@ EXTRA_DIST = \
 	extras/package/rpm/vlc.fedora.spec \
 	extras/package/rpm/vlc.mandriva.spec \
 	extras/package/rpm/vlc.altlinux.spec \
-	extras/package/win32/vlc.win32.nsi.in
+	extras/package/win32/vlc.win32.nsi.in \
+	extras/package/win32/languages/declaration.nsh \
+	extras/package/win32/languages/english.nsh \
+	extras/package/win32/languages/french.nsh
 
 dist_noinst_SCRIPTS = bootstrap toolbox
 
@@ -59,6 +65,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--disable-dbus \
 	--disable-dvd --disable-mad --disable-libmpeg2 \
 	--disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 \
+	--disable-live555 \
 	--disable-fribidi --disable-glx
 
 ACLOCAL_AMFLAGS = -I m4
@@ -307,12 +314,15 @@ DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile ChangeLog
 # Don't use it if you don't know what it is about.
 # Don't complain if it doesn't work. -- Courmisch
 libvlc:
-	cd src && $(MAKE) $(AM_MAKEFLAGS) libvlccore.la
+	cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
+
+core: libvlc
+	cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
 
-core:
-	cd src && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
+doc:
+	cd doc && $(MAKE) $(AM_MAKEFLAGS) doc
 
-.PHONY: libvlc core
+.PHONY: libvlc core doc
 
 #To get some nice output
 nice:
@@ -382,7 +392,7 @@ endif
 vlc$(EXEEXT): Makefile.am
 	rm -f -- vlc vlc.tmp
 	echo '#! /bin/sh' > vlc.tmp
-	echo 'exec "$$(dirname "$$0")/src/vlc$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp
+	echo 'exec "$$(dirname "$$0")/bin/vlc$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp
 	chmod +x vlc.tmp
 	mv -f -- vlc.tmp vlc
 
@@ -403,9 +413,10 @@ VLC-release.app: vlc
 	for i in vlc.xcodeproj Resources README.MacOSX.rtf ; do \
 	  cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
 	done
-	for i in  Resources Info.plist; do \
-	  cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
-	done
+	REVISION=`git-describe` && \
+	cat $(top_builddir)/extras/package/macosx/Info.plist | \
+	sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
+	cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/
 	for i in AUTHORS COPYING THANKS; do \
 	  cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
 	done
@@ -468,7 +479,7 @@ VLC-release.app: vlc
 	          $(top_builddir)/VLC-release.app; \
 	rm -Rf $(top_builddir)/tmp
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
-	ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
+	PRODUCT="VLC-release.app" ACTION="release-makefile" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist
 	for i in $(srcdir)/share/lua/playlist/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist/`basename $${i}` ; \
@@ -542,8 +553,8 @@ VLC-release.app: vlc
 	$(INSTALL) -m 644 $(srcdir)/share/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/readme.txt
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale
 	cat $(top_srcdir)/po/LINGUAS | while read i; do \
-	  mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
-	  cp $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+	  $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
+	  $(INSTALL) $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
 	  mkdir -p $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \
 	  ln -sf ../English.lproj/InfoPlist.strings \
 	      $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \
@@ -556,7 +567,7 @@ VLC-release.app: vlc
 
 # This is just for development purposes. 
 # The resulting VLC.app will only in this tree.
-VLC.app: vlc 
+VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.libs/libvlc.dylib
 	(cd src && make install)
 	rm -Rf $(top_builddir)/tmp
 	mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
@@ -564,9 +575,10 @@ VLC.app: vlc
 	for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
 	  cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
 	done
-	for i in  Resources Info.plist; do \
-	  cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
-	done
+	REVISION=`git-describe` && \
+	cat $(top_builddir)/extras/package/macosx/Info.plist | \
+	sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
+	cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/
 	for i in AUTHORS COPYING THANKS; do \
 	  cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
 	done
@@ -627,18 +639,15 @@ VLC.app: vlc
 	    cd ../../../../ && \
 	    cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \
 	          $(top_builddir)/VLC.app
-	rm -Rf $(top_builddir)/tmp
 	$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
 	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" ; \
-	   then ln -sfn "`pwd`/$$i" \
-				   "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \
-	  fi ; done && \
-	ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/
+	$(INSTALL) $(top_builddir)/bin/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC
+	ln -sf ../../../modules $(top_builddir)/VLC.app/Contents/MacOS/modules
+	install -d $(top_builddir)/VLC.app/Contents/MacOS/share
+	for i in `ls $(srcdir)/share`; do \
+	   ln -sf `pwd`/$(srcdir)/share/$$i $(top_builddir)/VLC.app/Contents/MacOS/share/; \
+	done
 	$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/locale
 	cat $(top_srcdir)/po/LINGUAS | while read i; do \
 	  mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
@@ -659,6 +668,9 @@ VLC.app: vlc
 # the same setup as the maintaner(s).
 #
 
+############################################################################
+## Win                                                                    ##
+############################################################################
 win32_destdir=$(top_builddir)/vlc-$(VERSION)
 win32_lua_destdir=$(win32_destdir)/lua
 win32_http_destdir=$(win32_destdir)/http
@@ -675,7 +687,7 @@ package-win-common:
 
 # Copy relevant files
 # Copy executables and libs
-	cp "$(top_builddir)/src/.libs/vlc$(EXEEXT)" "$(win32_destdir)/"
+	cp "$(top_builddir)/bin/.libs/vlc$(EXEEXT)" "$(win32_destdir)/"
 	cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(win32_destdir)/"
 	cp "$(top_builddir)/src/.libs/libvlccore$(LIBEXT)" "$(win32_destdir)/"
 	cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "$(win32_destdir)/"
@@ -726,6 +738,8 @@ package-win32-base-debug: package-win-common
 # Copy relevant files
 # Script installer
 	cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(win32_destdir)/"
+	mkdir "$(win32_destdir)/languages"
+	cp $(srcdir)/extras/package/win32/languages/*.nsh "$(win32_destdir)/languages/"
 
 # Plugins
 	mkdir -p "$(win32_destdir)/plugins"
@@ -897,10 +911,19 @@ package-win32-base-zip: package-win32-base
 	rm -f -- vlc-$(VERSION)-win32.zip
 	zip -r -9 vlc-$(VERSION)-win32.zip vlc-$(VERSION)
 
+package-win32-base-debug-zip: package-win32-base-debug
+# Create package
+	rm -f -- vlc-$(VERSION)-win32-debug.zip
+	zip -r -9 vlc-$(VERSION)-win32-debug.zip vlc-$(VERSION)
+
 package-win32-base-7zip: package-win32-base
 # Create package 
 	7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$(VERSION)-win32.7z vlc-$(VERSION)
 
+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
 	rm -Rf $(win32_destdir)
@@ -909,16 +932,28 @@ package-win32-zip: package-win32-base-zip
 # Clean up
 	rm -Rf $(win32_destdir)
 
+package-win32-debug-zip: package-win32-base-debug-zip
+# Clean up
+	rm -Rf $(win32_destdir)
+
 package-win32-7zip: package-win32-base-7zip
 # Clean up
 	rm -Rf $(win32_destdir)
 
+package-win32-debug-7zip: package-win32-base-debug-7zip
+# Clean up
+	rm -Rf $(win32_destdir)
+
 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-debug: package-win32-base-debug-zip package-win32-base-debug-7zip
+# Clean up
+	rm -Rf $(win32_destdir)
+
 package-wince-base: package-win-common package-win-common-strip
 
 package-wince-base-zip:
@@ -930,6 +965,9 @@ package-wince: package-wince-base  package-wince-base-zip
 	rm -Rf $(win32_destdir)
 
 
+#####################################################################
+##   BeOS                                                          ##
+#####################################################################
 package-beos:
 # Check that tmp isn't in the way
 	@if test -e $(srcdir)/tmp; then \
@@ -965,7 +1003,10 @@ package-beos:
 # Clean up
 	rm -Rf $(srcdir)/tmp
 
-package-macosx:
+#########################################################################
+## MacOS X                                                             ##
+#########################################################################
+package-macosx: VLC-release.app ChangeLog
 # Check that the temporary location isn't in the way
 	@if test -e "$(top_builddir)/vlc-$(VERSION)/"; then \
 	  rm -Rf "$(top_builddir)/vlc-$(VERSION)/" ; \
@@ -1033,7 +1074,7 @@ package-macosx:
 # Clean up
 	rm -Rf "$(top_builddir)/vlc-$(VERSION)"
 
-package-macosx-zip:
+package-macosx-zip: VLC-release.app
 	rm -Rf $(top_builddir)/vlc-$(VERSION)
 	mkdir -p $(top_builddir)/vlc-$(VERSION)
 	cp -R $(top_builddir)/VLC-release.app $(top_builddir)/vlc-$(VERSION)/VLC.app
@@ -1044,7 +1085,7 @@ package-macosx-zip:
 	cp -R  $(srcdir)/extras/package/macosx/Delete_Preferences.app \
 	     $(top_builddir)/vlc-$(VERSION)/Goodies
 	cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf \
-	   $(top_builddir)/vlc-$(VERSION)
+	   $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf
 	zip -r $(top_builddir)/vlc-$(VERSION).zip $(top_builddir)/vlc-$(VERSION)
 	rm -Rf $(top_builddir)/vlc-$(VERSION)