Hopefully fix libgcrypt linking

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 80807c20690ff668c4422d489f88eaf597fdc3b4..90c23d39cdc94bc9a320bc7d6d223d59f98374f1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,13 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \
        --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2
 
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = \
+       1.9 \
+       -Wall \
+       check-news \
+       std-options \
+       dist-bzip2 \
+       no-dist-gzip
 
 ###############################################################################
 # MacOS X project
@@ -346,6 +353,7 @@ vlc_app_DATA = VLC.app
 vlc_appdir = $(bindir)
 # VLC-release.app is the old VLC.app target
 VLC-release.app: vlc
+       ( cd  src && make  )
        @if test -e "$(top_builddir)/tmp"; then \
          echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \
          false; \
@@ -417,32 +425,7 @@ VLC-release.app: vlc
                  $(top_builddir)/VLC-release.app; \
        rm -Rf $(top_builddir)/tmp
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/lib
-       $(INSTALL) $(top_builddir)/.libs/vlc \
-                  $(top_builddir)/VLC-release.app/Contents/MacOS/VLC
-       $(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \
-                  $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc.dylib
-       $(INSTALL) $(top_builddir)/src/.libs/libvlc-control.1.dylib \
-                  $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc-control.dylib
-       install_name_tool -change /usr/local/lib/libvlc.1.dylib \
-                  @executable_path/lib/libvlc.dylib \
-                  $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc-control.dylib
-       install_name_tool -change /usr/local/lib/libvlc.1.dylib \
-                  @executable_path/lib/libvlc.dylib \
-              $(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
-       if test -d $(srcdir)/extras/contrib/vlc-lib; then \
-         mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/lib ; \
-         for i in $(srcdir)/extras/contrib/vlc-lib/*.dylib ; do \
-           $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/`basename $${i}` ; \
-         done ; \
-       fi
+       ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/extras/MacOSX/Framework/Pre-Compile.sh
        $(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}` ; \
@@ -540,7 +523,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 '{}' \;
 
-VLC.app: vlc
+VLC.app: vlc 
+       ( cd src && make install )
        @if test -e "$(top_builddir)/tmp"; then \
          echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \
          false; \
@@ -612,36 +596,15 @@ VLC.app: vlc
                  $(top_builddir)/VLC.app; \
        rm -Rf $(top_builddir)/tmp
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
-       $(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) $(top_builddir)/src/.libs/libvlc-control.1.dylib \
-                  $(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc-control.dylib
-       install_name_tool -change /usr/local/lib/libvlc.1.dylib \
-                  @executable_path/lib/libvlc.dylib \
-                  $(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc-control.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_name_tool -change /usr/local/lib/libvlc.1.dylib \
-                                  @executable_path/lib/libvlc.dylib \
-                          "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)"; \
-           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.app/Contents/MacOS/lib ; \
-         for i in $(srcdir)/extras/contrib/vlc-lib/*.dylib ; do \
-               install_name_tool -change /usr/local/lib/libvlc.1.dylib @executable_path/lib/libvlc.dylib $${i}; \
-           ln -sfn `pwd`/$${i} $(top_builddir)/VLC.app/Contents/MacOS/lib/`basename $${i}` ; \
-         done ; \
-       fi
+          then ln -sfn "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \
+                                  "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \
+         fi ; done && \
        ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale
        cat $(top_srcdir)/po/LINGUAS | while read i; do \