* added a new skin variable "vlc.hasVout", true when... there is a vout !

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8984c961edd2f862a0cf05cafa6d13999d9b2a34..e5ba439d8b52175eb9684184799201e1f4290182 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,9 @@ 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
@@ -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 \
@@ -225,6 +236,8 @@ endif
 # old automake-1.5 bug (automake/279).
 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`
@@ -245,8 +258,8 @@ 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.
@@ -407,11 +420,38 @@ VLC-release.app: vlc
            $(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 ; \
@@ -616,6 +656,8 @@ 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 ;
@@ -711,6 +753,10 @@ 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}
@@ -723,6 +769,10 @@ package-win32-zip: package-win32-base-zip
 # Clean up
        rm -Rf $(top_builddir)/vlc-${VERSION}
 
+package-win32-7zip: package-win32-base-7zip
+# Clean up
+       rm -Rf $(top_builddir)/vlc-${VERSION}
+
 package-win32: package-win32-base-exe package-win32-base-zip
 # Clean up
        rm -Rf $(top_builddir)/vlc-${VERSION}