Thanks Tanguy Krotoff.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 06ccb7bc1b5f4fc4e3ff3a2b88869db324975f30..9db5492396261727ab1af29268745f888ed5d188 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -217,7 +217,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
 
@@ -289,7 +288,9 @@ endif
 ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc
 bin_SCRIPTS += $(ALIASES)
 CLEANFILES += $(ALIASES)
+if BUILD_VLC
 EXTRA_SCRIPTS = $(ALL_ALIASES)
+endif
 
 dist_noinst_SCRIPTS += make-alias
 
@@ -313,7 +314,9 @@ qvlc: make-alias
 nvlc: make-alias
        $(MKALIAS) ncurses
 
+if BUILD_VLC
 noinst_SCRIPTS = vlc$(EXEEXT)
+endif
 
 vlc$(EXEEXT): core
        rm -f vlc$(EXEEXT)
@@ -326,8 +329,11 @@ vlc$(EXEEXT): core
 
 if HAVE_DARWIN
 # Create the MacOS X app
+if BUILD_VLC
 noinst_DATA = VLC.app
-# VLC-release.app is the old VLC.app target
+endif
+# 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"
@@ -400,7 +406,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}` ; \
@@ -498,6 +516,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
@@ -619,8 +639,8 @@ package-win-common:
        for file in AUTHORS MAINTAINERS THANKS ; \
          do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-$(VERSION)/$${file}.txt" ; done;
        for file in NEWS COPYING README; \
-          do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-$(VERSION)/$${file}.txt"; done
-         unix2dos "$(top_builddir)/vlc-$(VERSION)/"*.txt
+         do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-$(VERSION)/$${file}.txt"; done
+       unix2dos "$(top_builddir)/vlc-$(VERSION)/"*.txt
 
        mkdir $(top_builddir)/vlc-$(VERSION)/locale
        cat $(top_srcdir)/po/LINGUAS | while read i; do \