]> git.sesse.net Git - vlc/commitdiff
Makefile.am: Make the VLC-release.app target libtool aware.
authorPierre d'Herbemont <pdherbemont@videolan.org>
Sat, 21 Jul 2007 23:04:43 +0000 (23:04 +0000)
committerPierre d'Herbemont <pdherbemont@videolan.org>
Sat, 21 Jul 2007 23:04:43 +0000 (23:04 +0000)
Makefile.am

index 9c5a6bf6ee40f57242181d3172dd0d4822178a8e..ec997dc68c34cb2c48b4436251c4de7e65300768 100644 (file)
@@ -431,14 +431,20 @@ VLC-release.app: vlc
                  $(top_builddir)/VLC-release.app; \
        rm -Rf $(top_builddir)/tmp
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
-       $(INSTALL) $(top_builddir)/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
+       $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/lib
+       $(INSTALL) $(top_builddir)/.libs/vlc \
+                  $(top_builddir)/VLC.app/Contents/MacOS/VLC
+       $(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \
+                  $(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc.dylib
+       install_name_tool -change /usr/local/lib/libvlc.1.dylib \
+              @executable_path/lib/libvlc.dylib \
+                  $(top_builddir)/VLC.app/Contents/MacOS/VLC
+       ln -sf ./VLC $(top_builddir)/VLC.app/Contents/MacOS/clivlc
+       $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules
        for i in "" `$(VLC_CONFIG) --target plugin` ; do \
          if test -n "$$i" ; \
-           then $(INSTALL) "$$i$(LIBEXT)" \
-                          "$(top_builddir)/VLC-release.app/Contents/MacOS/modules" ; \
+           then ln -sfn "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \
+                          "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \
          fi ; done
        if test -d $(srcdir)/extras/contrib/vlc-lib; then \
          mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/lib ; \
@@ -572,7 +578,9 @@ VLC.app: vlc
                   $(top_builddir)/VLC.app/Contents/MacOS/VLC
        $(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \
                   $(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc.dylib
-       install_name_tool -change /usr/local/lib/libvlc.1.dylib @executable_path/lib/libvlc.dylib $(top_builddir)/VLC.app/Contents/MacOS/VLC
+       install_name_tool -change /usr/local/lib/libvlc.1.dylib \
+              @executable_path/lib/libvlc.dylib \
+                  $(top_builddir)/VLC.app/Contents/MacOS/VLC
        ln -sf ./VLC $(top_builddir)/VLC.app/Contents/MacOS/clivlc
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules
        for i in "" `$(VLC_CONFIG) --target plugin` ; do \