Make sure VLC.app doesn't take too much time to build. This breaks...

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

Makefile.am

@@ -548,6 +548,7 @@ VLC-release.app: vlc
 	find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \;
 
 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; \
@@ -619,36 +620,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)" \
+	   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.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
+	  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 \

configure.ac

@@ -186,6 +186,9 @@ case "${host_os}" in
         echo "Building with Mac OS X defaults:"
         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"
         enable_faad="yes"

extras/contrib/src/Makefile

@@ -210,38 +210,6 @@ endef
 #	$(INSTALL_NAME)
 #	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)
 # libtool won't accept to build the shared library
@@ -1126,9 +1094,6 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
 # ***************************************************************************
 .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 $@
 
 CLEAN_FILE += .dvdread