new (failing) test for libvlc

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 870250f3f57ccdf12d57f60ef246a7fd0f917521..62b768ba70122cdc68573f87947116d6ba8fc394 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,8 @@ BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean)
 SUFFIXES = 
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \
-       --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2
+       --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 \
+       --disable-fribidi
 
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = \
@@ -49,6 +50,10 @@ AUTOMAKE_OPTIONS = \
        no-dist-gzip
 #      std-options
 
+ChangeLog: Makefile.am
+       rm -f -- "$@"
+       ln -sf doc/ChangeLog-2008 "$@"
+
 ###############################################################################
 # MacOS X project
 ###############################################################################
@@ -217,7 +222,6 @@ EXTRA_DIST += \
        extras/analyser/vlc.vim \
        extras/analyser/valgrind.suppressions \
        extras/buildsystem/make.pl \
-       extras/buildsystem/autotools/m4/autoconf260.m4 \
        extras/misc/mpris.py \
        extras/misc/mpris.glade
 
@@ -239,7 +243,7 @@ vlc-config.in: vlc-config.in.in
        touch $@
 
 CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin
-DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
+DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile ChangeLog
 
 # Shortcut for developpers to rebuild the core (libvlc + vlc)
 # Don't use it if you don't know what it is about.
@@ -333,7 +337,8 @@ if HAVE_DARWIN
 if BUILD_VLC
 noinst_DATA = VLC.app
 endif
-# VLC-release.app is the old VLC.app target
+# VLC-release.app for packaging and giving it to your friends
+# use package-macosx to get a nice dmg
 VLC-release.app: vlc
        ( cd src && make install )
        rm -Rf "$(top_builddir)/tmp"
@@ -406,7 +411,19 @@ 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
+       $(INSTALL) $(top_builddir)/src/.libs/vlc \
+                  $(top_builddir)/VLC-release.app/Contents/MacOS/VLC
+       ln -sf ./VLC $(top_builddir)/VLC-release.app/Contents/MacOS/clivlc
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/modules
+       for i in "" `$(VLC_CONFIG) --target plugin` ; do \
+         if test -n "$$i" ; \
+           then $(INSTALL) "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \
+                          "$(top_builddir)/VLC-release.app/Contents/MacOS/modules" ; \
+         fi ; done
+       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/lib ; \
+         for i in $(srcdir)/src/.libs/*.dylib ; do \
+           $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/`basename $${i}` ; \
+         done ;
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist
        for i in $(srcdir)/share/luaplaylist/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist/`basename $${i}` ; \
@@ -504,6 +521,8 @@ VLC-release.app: vlc
        find $(top_builddir)/VLC-release.app -type d -exec chmod ugo+rx '{}' \;
        find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \;
 
+# This is just for development purposes. 
+# The resulting VLC.app will only in this tree.
 VLC.app: vlc 
        ( cd src && make install )
        rm -Rf $(top_builddir)/tmp