X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=ce606f1be9d297d4c831dc45597d643d85ec51ff;hb=33cb855c1469f8ce10ef72ebded98c94dc37afb9;hp=e28142fa9b3921ca01376103c999c87e155dbd51;hpb=f3d741a20994a7b454dde6aa5f8688932b06106b;p=vlc

diff --git a/Makefile.am b/Makefile.am
index e28142fa9b..ce606f1be9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,12 +2,6 @@
 # Automake targets and declarations
 ###############################################################################
 
-# Pass --quiet to make when we are not verbose.
-AM_MAKEFLAGS = $(makesilentflags_$(V))
-makesilentflags_ = $(makesilentflags__$(AM_DEFAULT_VERBOSITY))
-makesilentflags_0 = --quiet
-makesilentflags__0 = $(makesilentflags_0)
-
 # SUBDIRS stores the directories where a "make" is required when building
 # something. DIST_SUBDIRS stores the directories where nothing is built but
 # which have makefiles with distribution information.
@@ -74,9 +68,12 @@ SUFFIXES =
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-fast-install \
+	--disable-a52 \
+	--disable-avcodec --disable-avformat \
+	--disable-postproc --disable-swscale \
 	--disable-dbus \
-	--disable-dvd --disable-mad --disable-libmpeg2 \
-	--disable-ffmpeg --disable-faad --disable-skins2 \
+	--disable-mad --disable-libmpeg2 \
+	--disable-faad --disable-skins2 \
 	--disable-live555 \
 	--disable-fribidi --disable-glx
 
@@ -341,10 +338,6 @@ doc:
 
 .PHONY: libvlc core doc
 
-#To get some nice output
-nice:
-	$(top_builddir)/compile
-
 if HAVE_BEOS
 noinst_DATA = vlc-bundle
 vlc-bundle: vlc
@@ -385,42 +378,40 @@ dist_noinst_SCRIPTS += make-alias
 MKALIAS = bindir="$(bindir)" transform="$(transform)" program_prefix="$(program_prefix)" program_suffix="$(program_suffix)" $(top_srcdir)/make-alias $@
 
 cvlc: make-alias Makefile
-	$(MKALIAS) dummy
+	$(AM_V_GEN)$(MKALIAS) dummy
 
 rvlc: make-alias Makefile
-	$(MKALIAS) rc
+	$(AM_V_GEN)$(MKALIAS) rc
 
 svlc: make-alias Makefile
-	$(MKALIAS) skins2
+	$(AM_V_GEN)$(MKALIAS) skins2
 
 qvlc: make-alias Makefile
-	$(MKALIAS) qt4
+	$(AM_V_GEN)$(MKALIAS) qt4
 
 nvlc: make-alias Makefile
-	$(MKALIAS) ncurses
+	$(AM_V_GEN)$(MKALIAS) ncurses
 
 mvlc: make-alias Makefile
-	$(MKALIAS) maemo
+	$(AM_V_GEN)$(MKALIAS) maemo
 
 if BUILD_VLC
 noinst_SCRIPTS += vlc$(EXEEXT)
 endif
 
 vlc$(EXEEXT):
-	ln -sf bin/vlc-static$(EXEEXT) vlc$(EXEEXT)
+	$(AM_V_GEN)ln -sf bin/vlc-static$(EXEEXT) vlc$(EXEEXT)
 
 if HAVE_DARWIN
-if BUILD_VLC
+if BUILD_MACOSX_VLC_APP
 # Create the MacOS X app
 noinst_DATA = VLC.app
 endif
 endif
 
 silentstd = $(silentstd_$(V))
-silentstd_ = $(silentstd__$(AM_DEFAULT_VERBOSITY))
+silentstd_ = $(silentstd_$(AM_DEFAULT_VERBOSITY))
 silentstd_0 = 2>&1 >/dev/null
-# '__' prefix trick for old automake version.
-silentstd__0 = $(silentstd_0)
 
 # VLC-release.app for packaging and giving it to your friends
 # use package-macosx to get a nice dmg
@@ -492,9 +483,9 @@ VLC-release.app: vlc
              $(top_builddir)/tmp/modules/gui/macosx; \
 	done
 	$(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
-        xcodebuild -target vlc $(silentstd) && \
+        xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \
 	cd ../../../../ && \
-	cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle $(top_builddir)/VLC-release.app; \
+	cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC-release.app; \
 	rm -Rf $(top_builddir)/tmp
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
 	PRODUCT="VLC-release.app" ACTION="release-makefile" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
@@ -645,9 +636,9 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
              $(top_builddir)/tmp/modules/gui/macosx; \
 	done
 	$(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
-	xcodebuild -target vlc $(silentstd) && \
+	xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \
 	cd ../../../../ && \
-	cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle $(top_builddir)/VLC.app
+	cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC.app
 	$(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
@@ -681,6 +672,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
 ## Win                                                                    ##
 ############################################################################
 win32_destdir=$(top_builddir)/vlc-$(VERSION)
+win32_xpi_destdir=$(win32_destdir)/vlc-plugin
 win32_debugdir=$(top_builddir)/symbols-$(VERSION)
 npvlc=vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)
 axvlc=vlc-$(VERSION)/activex/axvlc$(LIBEXT)
@@ -696,12 +688,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)/"
 
@@ -720,8 +720,7 @@ package-win-common:
 	cat $(top_srcdir)/po/LINGUAS | while read i; do \
 	  mkdir -p "$(win32_destdir)/locale/$${i}/LC_MESSAGES" ; \
 	  cp "$(srcdir)/po/$${i}.gmo" \
-	    "$(win32_destdir)/locale/$${i}/LC_MESSAGES/vlc.mo" \
-            || true ; \
+	    "$(win32_destdir)/locale/$${i}/LC_MESSAGES/vlc.mo" || true ; \
 	done
 	mkdir -p $(win32_destdir)/locale/qt4/
 	cp $(QT4LOCALEDIR)/*.qm $(win32_destdir)/locale/qt4/ || true
@@ -739,7 +738,6 @@ if BUILD_ACTIVEX
 	cp $(srcdir)/projects/activex/README.TXT  $(win32_destdir)/activex/
 	cp $(srcdir)/projects/activex/test.html  $(win32_destdir)/activex/
 	unix2dos $(win32_destdir)/activex/*
-
 	cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(win32_destdir)/activex/
 	cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)/activex/
 endif
@@ -749,6 +747,26 @@ endif
 		find $(win32_destdir) -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \
 	fi
 
+package-win32-xpi: package-win-common-strip
+	mkdir -p "$(win32_xpi_destdir)/plugins"
+	cp $(top_builddir)/projects/mozilla/install.rdf "$(win32_xpi_destdir)"
+	cp $(win32_destdir)/mozilla/npvlc$(LIBEXT) \
+		"$(win32_xpi_destdir)/plugins"
+	cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest \
+		"$(win32_xpi_destdir)/plugins"
+	cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" \
+		"$(win32_xpi_destdir)/plugins"
+	cp "$(win32_destdir)/libvlccore$(LIBEXT)" \
+		"$(win32_xpi_destdir)/plugins"
+	cp "$(win32_destdir)/libvlc$(LIBEXT)" \
+		"$(win32_xpi_destdir)/plugins"
+	mkdir -p "$(win32_xpi_destdir)/plugins/plugins"
+	cp $(win32_destdir)/plugins/*$(LIBEXT) \
+		"$(win32_xpi_destdir)/plugins/plugins"
+	rm -rf "$(win32_xpi_destdir)/plugins/plugins/*qt*"
+	rm -rf "$(win32_xpi_destdir)/plugins/plugins/*skins*"
+	cd $(win32_xpi_destdir) && zip -r vlc-$(VERSION).xpi install.rdf plugins
+
 package-win32-base-debug: package-win-common
 # Copy relevant files
 # Script installer
@@ -764,9 +782,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 \
@@ -774,8 +789,8 @@ if USE_PEFLAGS
 	done
 endif
 
-# Copy the lua scripts (HTTP)
 if BUILD_LUA
+# Copy the lua scripts (HTTP)
 	mkdir -p "$(win32_lua_destdir)/http/images"
 	mkdir -p "$(win32_lua_destdir)/http/requests"
 	mkdir -p "$(win32_lua_destdir)/http/js"
@@ -788,6 +803,8 @@ if BUILD_LUA
 	unix2dos $(win32_lua_destdir)/http/*.css
 	cp $(srcdir)/share/lua/http/js/*.js $(win32_lua_destdir)/http/js/
 	unix2dos $(win32_lua_destdir)/http/js/*.js
+	cp $(srcdir)/share/lua/http/*.lua $(win32_lua_destdir)/http/
+	unix2dos $(win32_lua_destdir)/http/*.lua
 	cp $(srcdir)/share/lua/http/dialogs/* $(win32_lua_destdir)/http/dialogs/
 	unix2dos $(win32_lua_destdir)/http/dialogs/*
 	cp $(srcdir)/share/lua/http/dialogs/.hosts $(win32_lua_destdir)/http/dialogs/
@@ -798,21 +815,19 @@ if BUILD_LUA
 	unix2dos $(win32_lua_destdir)/http/requests/*.xml
 	cp $(srcdir)/share/lua/http/requests/readme $(win32_lua_destdir)/http/requests/readme.txt
 	unix2dos $(win32_lua_destdir)/http/requests/readme.txt
-endif
 
-if BUILD_LUA
 #Lua Scripts
 	$(INSTALL) -d $(win32_lua_destdir)
 	for i in $(srcdir)/share/lua/*.* ; do \
 	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/`basename $${i}` ; \
 	done
-	$(INSTALL) -d $(win32_lua_destdir)/playlist
-	for i in $(srcdir)/share/lua/playlist/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \
+	$(INSTALL) -d $(win32_lua_destdir)/modules
+	for i in $(srcdir)/share/lua/modules/*.* ; do \
+	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/modules/`basename $${i}` ; \
 	done
-	$(INSTALL) -d $(win32_lua_destdir)/meta
-	for i in $(srcdir)/share/lua/meta/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/`basename $${i}` ; \
+	$(INSTALL) -d $(win32_lua_destdir)/extensions
+	for i in $(srcdir)/share/lua/extensions/*.* ; do \
+	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/extensions/`basename $${i}` ; \
 	done
 	$(INSTALL) -d $(win32_lua_destdir)/intf
 	for i in $(srcdir)/share/lua/intf/*.* ; do \
@@ -822,6 +837,35 @@ if BUILD_LUA
 	for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
 	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/intf/modules/`basename $${i}` ; \
 	done
+	$(INSTALL) -d $(win32_lua_destdir)/meta/art
+	for i in $(srcdir)/share/lua/meta/art/*.* ; do \
+	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/art/`basename $${i}` ; \
+	done
+	$(INSTALL) -d $(win32_lua_destdir)/meta/fetcher
+	for i in $(srcdir)/share/lua/meta/fetcher/*.* ; do \
+	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/fetcher/`basename $${i}` ; \
+	done
+	$(INSTALL) -d $(win32_lua_destdir)/meta/reader
+	for i in $(srcdir)/share/lua/meta/reader/*.* ; do \
+	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/reader/`basename $${i}` ; \
+	done
+	$(INSTALL) -d $(win32_lua_destdir)/playlist
+	for i in $(srcdir)/share/lua/playlist/*.* ; do \
+	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \
+	done
+	$(INSTALL) -d $(win32_lua_destdir)/sd
+	for i in $(srcdir)/share/lua/sd/*.* ; do \
+	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/sd/`basename $${i}` ; \
+	done
+
+	unix2dos $(win32_lua_destdir)/README.txt
+	unix2dos $(win32_lua_destdir)/extensions/README.txt
+	unix2dos $(win32_lua_destdir)/intf/README.txt
+	unix2dos $(win32_lua_destdir)/meta/art/README.txt
+	unix2dos $(win32_lua_destdir)/meta/fetcher/README.txt
+	unix2dos $(win32_lua_destdir)/meta/reader/README.txt
+	unix2dos $(win32_lua_destdir)/playlist/README.txt
+	unix2dos $(win32_lua_destdir)/sd/README.txt
 endif
 
 # Copy the http files
@@ -894,13 +938,10 @@ 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) \
+	            $(win32_destdir)/mozilla/*$(LIBEXT) \
 	            $(win32_destdir)/plugins/*$(LIBEXT) \
 	; do \
 	  if test -n "$$i" ; then \
@@ -948,36 +989,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
@@ -985,9 +1019,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
 
 
 #####################################################################
@@ -1160,6 +1192,16 @@ if BUILD_MOZILLA
 	rm -rf "$(top_builddir)/vlc-plugin-$(VERSION)"
 endif
 
+package-macosx-xpi:
+if BUILD_MOZILLA
+	mkdir -p "$(top_builddir)/macosx-xpi/plugins"
+	cp $(top_builddir)/projects/mozilla/install.rdf \
+		"$(top_builddir)/macosx-xpi/"
+	cp -R "$(top_builddir)/projects/mozilla/VLC Plugin.plugin" \
+		"$(top_builddir)/macosx-xpi/plugins"
+	cd "$(top_builddir)/macosx-xpi" && zip -r vlc-$(VERSION).xpi install.rdf plugins
+endif
+
 package-translations:
 	@if test -e "$(srcdir)/vlc-translations-$(VERSION)"; then \
 	  echo "Error: please remove $(srcdir)/vlc-translations-$(VERSION), it is in the way"; \