]> git.sesse.net Git - vlc/blobdiff - Makefile.am
The Debian packaging data have been moved to svn.v.o/pkg-multimedia
[vlc] / Makefile.am
index b4808335a39ccdb85d68f1e1b7b9527e56300e79..e7657ebef2de3032d54033b049c3574b2f2a5c6d 100644 (file)
@@ -28,10 +28,10 @@ EXTRA_DIST = \
        vlc-config.in.in \
        vlc.spec \
        vlc.spec.mdk \
-       vlc.win32.nsi \
+       vlc.win32.nsi.in \
        $(NULL)
 
-BUILT_SOURCES_distclean = vlc-config compile
+BUILT_SOURCES_distclean = vlc-config compile vlc.win32.nsi
 BUILT_SOURCES_clean = macosx-sdk
 
 BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean)
@@ -40,13 +40,16 @@ SUFFIXES =
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \
        --disable-ffmpeg --disable-faad --disable-skins2
+if USE_LIBTOOL
+DISTCHECK_CONFIGURE_FLAGS += --enable-libtool
+endif
 
 # Tell aclocal to use -I m4. Wonder if it really works.
 ACLOCAL_AMFLAGS = -I m4
 
 # XXX: these flags could be set in configure.ac, but we set them here
 # because old versions of automake don't support them in configure.ac.
-AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects
+AUTOMAKE_OPTIONS = dist-bzip2
 
 ###############################################################################
 # MacOS X project
@@ -142,6 +145,14 @@ EXTRA_DIST += \
        extras/MacOSX/Resources/volumeslider_normal.png \
        extras/MacOSX/Resources/volumetrack.png \
        extras/MacOSX/Resources/about_bg.png \
+       extras/MacOSX/Resources/skip_forward_active_embedded.png \
+       extras/MacOSX/Resources/play_embedded.png \
+       extras/MacOSX/Resources/pause_embedded.png \
+       extras/MacOSX/Resources/skip_previous_active_embedded.png \
+       extras/MacOSX/Resources/pause_embedded_blue.png \
+       extras/MacOSX/Resources/play_embedded_blue.png \
+       extras/MacOSX/Resources/skip_forward_embedded_blue.png \
+       extras/MacOSX/Resources/skip_previous_embedded_blue.png \
        extras/MacOSX/Resources/vlc.scriptSuite \
        extras/MacOSX/Resources/vlc.scriptTerminology \
        extras/MacOSX/Resources/README \
@@ -153,8 +164,23 @@ EXTRA_DIST += \
        extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.icns \
        extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.rsrc \
        extras/MacOSX/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt \
+       extras/MacOSX/plugin/Info.plist \
+       extras/MacOSX/plugin/InstallerInfo.plist \
+       extras/MacOSX/plugin/InstallerDescription.plist \
+       extras/MacOSX/plugin/pbdevelopment.plist \
+       extras/MacOSX/plugin/English.lproj/InfoPlist.strings \
+       $(NULL)
+
+###############################################################################
+# Various utilities ( editor syntax files, ... )
+##############################################################################
+EXTRA_DIST += \
        extras/Makefile \
        extras/zsh.cpp \
+       extras/emacs.init \
+       extras/vlc.vim \
+       extras/make.pl \
+       extras/valgrind.suppressions \
        $(NULL)
 
 ###############################################################################
@@ -200,16 +226,6 @@ DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
 # Building vlc
 ###############################################################################
 
-.PHONY: libvlc
-
-# Shortcut for developpers to rebuild the core (libvlc + vlc)
-# Don't use it if you don't know what it is about.
-# Don't complain if it doesn't work. -- Courmisch
-core: libvlc vlc$(EXEEXT)
-
-libvlc:
-       cd src && $(MAKE) all
-
 bin_PROGRAMS = vlc
 
 vlc_SOURCES = src/vlc.c
@@ -218,35 +234,49 @@ EXTRA_vlc_SOURCES = extras/zsh.cpp
 
 # Work around a bug in the arm-wince-pe linker
 if HAVE_WINCE
-vlc_WORKAROUNDLDFLAGS = $(LIB_libvlc)
+vlc_WORKAROUNDLDFLAGS = $(LIBVLC)
 endif
 
 # We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an
 # old automake-1.5 bug (automake/279).
-DEPENDENCIES_vlc = $(LIB_libvlc) $(DATA_win32_rc)
+DEPENDENCIES_vlc = src/$(LIB_libvlc) $(DATA_win32_rc)
+
+vlc_LDADD = $(DATA_win32_rc) $(LIBVLC)
 
 vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 if USE_LIBTOOL
 vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc`
-LIB_libvlc = src/libvlc.la
-LIBVLC = $(LIB_libvlc)
+LIB_libvlc = libvlc.la
+LIBVLC = src/$(LIB_libvlc)
 else
 if BUILD_SHARED
 vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` -Wl,-rpath $(libdir) -L$(top_builddir)/src -lvlc
 if HAVE_WIN32
-LIB_libvlc = src/libvlc.dll.a
+LIB_libvlc = libvlc.dll.a
 else
-LIB_libvlc = src/libvlc$(LIBEXT)
+LIB_libvlc = libvlc$(LIBEXT)
 endif
 LIBVLC =
 else
 vlc_LDFLAGS = $(vlc_WORKAROUNDLFDLAGS) `$(VLC_CONFIG) --libs vlc builtin`
-LIB_libvlc = src/libvlc.a
-LIBVLC = $(LIB_libvlc)
+LIB_libvlc = libvlc.a
+LIBVLC = src/$(LIB_libvlc)
 DEPENDENCIES_vlc += stamp-builtin
 endif
+vlc_LDADD += $(INCLUDED_LIBINTL)
 endif
-vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(INCLUDED_LIBINTL)
+
+# Shortcut for developpers to rebuild the core (libvlc + vlc)
+# Don't use it if you don't know what it is about.
+# Don't complain if it doesn't work. -- Courmisch
+core:
+       rm -f src/$(LIB_libvlc)
+       $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
+
+.PHONY: core
+
+src/$(LIB_libvlc):
+       cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
 
 vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
        @rm -f vlc$(EXEEXT)
@@ -354,6 +384,12 @@ VLC-release.app: vlc
            bookmarks.m \
            sfilters.h \
            sfilters.m \
+           update.h \
+           update.m \
+           interaction.h \
+           interaction.m \
+           embeddedwindow.h \
+           embeddedwindow.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -386,14 +422,41 @@ VLC-release.app: vlc
        if test -d $(srcdir)/extras/contrib/vlc-lib; then \
          mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/lib ; \
          for i in $(srcdir)/extras/contrib/vlc-lib/*.dylib ; do \
-           $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/vlc_`basename $${i}` ; \
+           $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/`basename $${i}` ; \
          done ; \
        fi
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http
-       for i in $(srcdir)/share/http/* ; do \
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests
+       for i in $(srcdir)/share/http/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \
        done ; \
+       for i in $(srcdir)/share/http/dialogs/* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs/`basename $${i}` ; \
+       done ; \
+       for i in $(srcdir)/share/http/js/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js/`basename $${i}` ; \
+       done ; \
+       for i in $(srcdir)/share/http/old/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/`basename $${i}` ; \
+       done ; \
+       for i in $(srcdir)/share/http/old/admin/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin/`basename $${i}` ; \
+       done ; \
+       for i in $(srcdir)/share/http/old/vlm/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm/`basename $${i}` ; \
+       done ; \
+       for i in $(srcdir)/share/http/images/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images/`basename $${i}` ; \
+       done ; \
+       for i in $(srcdir)/share/http/requests/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/`basename $${i}` ; \
+       done ; \
+       $(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/locale
        for i in $(ALL_LINGUAS); do \
          mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
@@ -459,6 +522,12 @@ VLC.app: vlc
            bookmarks.m \
            sfilters.h \
            sfilters.m \
+           update.h \
+           update.m \
+           interaction.h \
+           interaction.m \
+           embeddedwindow.h \
+           embeddedwindow.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -491,7 +560,7 @@ VLC.app: vlc
        if test -d $(srcdir)/extras/contrib/vlc-lib; then \
          mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/lib ; \
          for i in $(srcdir)/extras/contrib/vlc-lib/*.dylib ; do \
-           ln -sfn `pwd`/$${i} $(top_builddir)/VLC.app/Contents/MacOS/lib/vlc_`basename $${i}` ; \
+           ln -sfn `pwd`/$${i} $(top_builddir)/VLC.app/Contents/MacOS/lib/`basename $${i}` ; \
          done ; \
        fi
        ln -sfn `pwd`/share $(top_builddir)/VLC.app/Contents/MacOS/
@@ -555,10 +624,8 @@ package-win-common:
 # Copy relevant files
        cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/"
        cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/"
-       $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)"
 if BUILD_SHARED
        cp "src/libvlc$(LIBEXT)" "vlc-${VERSION}/"
-       $(STRIP) "vlc-${VERSION}/libvlc$(LIBEXT)"
 endif
 
        for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
@@ -592,10 +659,11 @@ endif
        cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-${VERSION}/http/images/
        cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/*.xml ;
+       cp $(srcdir)/share/http/requests/readme $(top_builddir)/vlc-${VERSION}/http/requests/readme.txt ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/readme.txt ;
 
        cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-${VERSION}/http/old/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/old/*.html ;
-       cp $(srcdir)/share/http/old/*.ico $(top_builddir)/vlc-${VERSION}/http/old/ ;
        cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-${VERSION}/http/old/ ;
        cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-${VERSION}/http/old/ ;
        cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http/old/vlm/ ;
@@ -608,7 +676,6 @@ endif
 if BUILD_MOZILLA
        mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
        cp $(top_builddir)/mozilla/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ;
-       $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT);
        cp $(top_builddir)/mozilla/vlcintf.xpt  $(top_builddir)/vlc-${VERSION}/mozilla/ ;
 endif
 
@@ -619,16 +686,27 @@ if BUILD_ACTIVEX
        unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ;
 
        cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ;
-       $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT);
 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)"
+if BUILD_SHARED
+       $(STRIP) "vlc-${VERSION}/libvlc$(LIBEXT)"
+endif
+if BUILD_MOZILLA
+       $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT);
+endif
+if BUILD_ACTIVEX
+       $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT);
+endif
+
 package-win32-base-debug: package-win-common
 # Copy relevant files
-       cp "$(srcdir)/vlc.win32.nsi" "$(top_builddir)/vlc-${VERSION}/"
+       cp "$(top_builddir)/vlc.win32.nsi" "$(top_builddir)/vlc-${VERSION}/"
 
        mkdir -p "$(top_builddir)/vlc-${VERSION}/plugins"
        for i in "" `$(VLC_CONFIG) --target plugin` ; do \
@@ -658,12 +736,11 @@ package-win32-base-debug: package-win-common
        sed -i 's%/%\\%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg 
 
 
-package-win32-base: package-win32-base-debug
+package-win32-base: package-win32-base-debug 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-exe: package-win32-base
 # Create package
        if makensis -VERSION >/dev/null 2>&1; then \
            MAKENSIS="makensis -DVERSION=${VERSION}"; \
@@ -683,10 +760,14 @@ package-win32-base-exe-linux:
 # Create package
        makensis -DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi
 
-package-win32-base-zip:
+package-win32-base-zip: package-win32-base
 # Create package 
        zip -r vlc-${VERSION}-win32.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-exe: package-win32-base package-win32-base-exe
 # Clean up
        rm -Rf $(top_builddir)/vlc-${VERSION}
@@ -695,15 +776,19 @@ package-win32-exe-linux: package-win32-base package-win32-base-exe-linux
 # Clean up
        rm -Rf $(top_builddir)/vlc-${VERSION}
 
-package-win32-zip: package-win32-base package-win32-base-zip
+package-win32-zip: package-win32-base-zip
 # Clean up
        rm -Rf $(top_builddir)/vlc-${VERSION}
 
-package-win32: package-win32-base package-win32-base-exe package-win32-base-zip
+package-win32-7zip: package-win32-base-7zip
 # Clean up
        rm -Rf $(top_builddir)/vlc-${VERSION}
 
-package-wince-base: package-win-common
+package-win32: package-win32-base-exe package-win32-base-zip
+# Clean up
+       rm -Rf $(top_builddir)/vlc-${VERSION}
+
+package-wince-base: package-win-common package-win-common-strip
 
 package-wince-base-zip:
 # Create package 
@@ -766,13 +851,39 @@ package-macosx:
        echo "Creating disk image" ;
        rm -f "$(top_builddir)/vlc-${VERSION}.dmg" ;
        hdiutil create -srcfolder "$(top_builddir)/vlc-${VERSION}" \
-         "$(top_builddir)/vlc-${VERSION}.dmg" -format UDZO -quiet ;
-       echo; echo "Disk image creation completed:" ;
+         "$(top_builddir)/vlc-${VERSION}.dmg" -format UDZO \
+         -scrub -imagekey zlib-level=9 ;
+       echo "Disk image creation completed:" ;
        ls -la "$(top_builddir)/vlc-${VERSION}.dmg" ; echo ;
 
 # Clean up
        rm -Rf "$(top_builddir)/vlc-${VERSION}" ;
 
+package-macosx-plugin:
+if BUILD_MOZILLA
+# Create Installer
+       rm -rf "$(top_builddir)/macosx-plugin-instdata/"; true
+       mkdir -p "$(top_builddir)/macosx-plugin-instdata"
+       cp -R "$(top_builddir)/mozilla/VLC Plugin.plugin" "$(top_builddir)/macosx-plugin-instdata"
+       rm -rf "$(top_builddir)/VLC Internet Plug-In.pkg"
+       /Developer/Tools/packagemaker -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \
+       -f "$(top_builddir)/macosx-plugin-instdata" \
+       -i "$(srcdir)/extras/MacOSX/plugin/InstallerInfo.plist" \
+       -d "$(srcdir)/extras/MacOSX/plugin/InstallerDescription.plist"; true
+       rm -rf "$(top_builddir)/macosx-plugin-instdata/"
+
+# Create disk image 
+       rm -f "$(top_builddir)/vlc-plugin-${VERSION}.dmg"; true
+       rm -rf "$(top_builddir)/vlc-plugin-${VERSION}/"; true
+       mkdir -p "$(top_builddir)/vlc-plugin-${VERSION}/"
+       mv "$(top_builddir)/VLC Internet Plug-In.pkg" "$(top_builddir)/vlc-plugin-${VERSION}/"
+       hdiutil create -srcfolder "$(top_builddir)/vlc-plugin-${VERSION}" \
+         "$(top_builddir)/vlc-plugin-${VERSION}.dmg" -format UDZO \
+         -scrub -imagekey zlib-level=9 ;
+       echo "Disk image creation completed:"
+       rm -rf "$(top_builddir)/vlc-plugin-${VERSION}"
+endif
+
 package-translations:
        @if test -e "$(srcdir)/vlc-translations-${VERSION}"; then \
          echo "Error: please remove $(srcdir)/vlc-translations-${VERSION}, it is in the way"; \