Changeset 20f3acbf3852dd65cff6065b08c15f7665c7cc50

Timestamp:

01/02/08 00:20:45 (10 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1201821645 +0000

git-parent:

[a80b4670ad25c57fce95af299fb3f6bbf97b8ecf]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1201821645 +0000

Message:

Make sure VLC.app doesn't take too much time to build. This breaks VLC-release.app, and following commit will fix that.

Files:

• Makefile.am (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• extras/contrib/src/Makefile (modified) (2 diffs)

Makefile.am

@@ -548 +548 @@
-    find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \;
-
-
+
+
-    @if test -e "$(top_builddir)/tmp"; then \
-      echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \
@@ -620 +621 @@
-    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" ; \
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/
-    $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale

configure.ac

@@ -187 +187 @@
-        with_macosx_version_min="10.4"
-        echo "  Assuming --with-macosx-version-min=10.4"
+        build_dir=`pwd`
+        echo "  Assuming --prefix=${build_dir}/vlc_install_dir"
+        ac_default_prefix="${build_dir}/vlc_install_dir"
-        enable_macosx="yes"
-        echo "  Assuming --enable-macosx"

extras/contrib/src/Makefile

@@ -211 +211 @@
-#   touch $@
-
-ifdef HAVE_DARWIN_OS
-# the original libtoto.dylib is copied from contrib/lib to vlc-lib as
-# vlc_libtoto.dylib. a soft link to this library is created in contrib/lib
-# using the orginal dylib name. if libtoto.la also exists, the library named
-# in dlname is also changed to a soft-link to vlc-lib in order to support
-# libtool. to satisfy VLC.app dyld search, vlc_libtoto.dylib dyld id is changed
-# to @executable_path/lib/vlc_libtoto.dylib 
-
-define INSTALL_NAME
-    if which install_name_tool >/dev/null; then \
-        mkdir -p $(PREFIX)/vlc-lib ; \
-        libname='lib$(patsubst .%,%,$@)' ; \
-        dlname="$$libname.dylib" ; \
-        cp $(PREFIX)/lib/$$dlname \
-            $(PREFIX)/vlc-lib/vlc_$$dlname ; \
-        rm $(PREFIX)/lib/$$dlname ; \
-        ln -s $(PREFIX)/vlc-lib/vlc_$$dlname \
-            $(PREFIX)/lib/$$dlname ; \
-        if [ -f $(PREFIX)/lib/$$libname.la ]; then \
-            eval ltname=`sed -n 's/dlname=//p' $(PREFIX)/lib/$$libname.la`; \
-            rm $(PREFIX)/lib/$$ltname ; \
-            ln -s $(PREFIX)/vlc-lib/vlc_$$dlname \
-                $(PREFIX)/lib/$$ltname ; \
-        fi ; \
-        install_name_tool \
-            -id @executable_path/lib/vlc_$$dlname \
-            $(PREFIX)/vlc-lib/vlc_$$dlname ; \
-    fi
-endef
-
-endif
-
-ifeq ($(HOST),i586-pc-beos)
-# We test if the file actually exists, as sometimes (but not always)
@@ -1127 +1095 @@
-.dvdread: .dvdnav
-    $(INSTALL_NAME)
-ifdef HAVE_DARWIN_OS
-    install_name_tool -change $(PREFIX)/lib/libdvdread.4.dylib @executable_path/lib/vlc_libdvdread.dylib $(PREFIX)/vlc-lib/vlc_libdvdnav.dylib
-endif
-    touch $@
-