]> git.sesse.net Git - vlc/blobdiff - Makefile.am
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
VLCKit: preparsed->parsed.
[vlc] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index fff7f22f77342cf37cca62a5291541011c422eaf..42e94f137d84ce9ee0313a9355ed1c78ab95e690 100644 (file)
--- 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,29 +378,29 @@ 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_MACOSX_VLC_APP
@@ -417,10 +410,8 @@ 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
@@ -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)/"
 
@@ -749,6 +749,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 +784,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 \
@@ -900,12 +917,6 @@ 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) \
@@ -957,36 +968,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
@@ -994,9 +998,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
 
 
 #####################################################################
@@ -1169,6 +1171,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"; \
Unnamed repository; edit this file 'description' to name the repository.