Changeset 3e75c8bc8fb5246b6bcc496c240e47dc9a9e156b

Show
Ignore:
Timestamp:
02/01/08 02:31:08 (5 months ago)
Author:
Pierre d'Herbemont <pdherbemont@videolan.org>
git-committer:
Pierre d'Herbemont <pdherbemont@videolan.org> 1201829468 +0000
git-parent:

[95a6cb5e37fa2a96fed78592f92619b1030c86e4]

git-author:
Pierre d'Herbemont <pdherbemont@videolan.org> 1201829468 +0000
Message:

Makefile.am: Fix VLC-release.app, this uses the Pre-Compile.sh script from the Framework.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • Makefile.am

    r20f3acb r3e75c8b  
    354354# VLC-release.app is the old VLC.app target 
    355355VLC-release.app: vlc 
     356    ( cd  src && make  ) 
    356357    @if test -e "$(top_builddir)/tmp"; then \ 
    357358      echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \ 
     
    425426    rm -Rf $(top_builddir)/tmp 
    426427    $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS 
    427     $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/lib 
    428     $(INSTALL) $(top_builddir)/.libs/vlc \ 
    429            $(top_builddir)/VLC-release.app/Contents/MacOS/VLC 
    430     $(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \ 
    431            $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc.dylib 
    432     $(INSTALL) $(top_builddir)/src/.libs/libvlc-control.1.dylib \ 
    433            $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc-control.dylib 
    434     install_name_tool -change /usr/local/lib/libvlc.1.dylib \ 
    435            @executable_path/lib/libvlc.dylib \ 
    436            $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc-control.dylib 
    437     install_name_tool -change /usr/local/lib/libvlc.1.dylib \ 
    438            @executable_path/lib/libvlc.dylib \ 
    439            $(top_builddir)/VLC-release.app/Contents/MacOS/VLC 
    440     ln -sf ./VLC $(top_builddir)/VLC-release.app/Contents/MacOS/clivlc 
    441     $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/modules 
    442     for i in `$(VLC_CONFIG) --target plugin` ; do \ 
    443       if test -n "$$i" ; \ 
    444         then $(INSTALL) "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \ 
    445                "$(top_builddir)/VLC-release.app/Contents/MacOS/modules" ; \ 
    446       fi ; done 
    447     if test -d $(srcdir)/extras/contrib/vlc-lib; then \ 
    448       mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/lib ; \ 
    449       for i in $(srcdir)/extras/contrib/vlc-lib/*.dylib ; do \ 
    450         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/`basename $${i}` ; \ 
    451       done ; \ 
    452     fi 
     428    ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/extras/MacOSX/Framework/Pre-Compile.sh 
    453429    $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist 
    454430    for i in $(srcdir)/share/luaplaylist/*.* ; do \