X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=5790052068d97cabce610aa9944ef5daddc64c23;hb=066e58dd3454554fed6dad53fd2513736087720d;hp=d3b5084f4e15e355364fe1816d527c1257562930;hpb=402d93f759a306d16e62cd2d5d4e1f6735596f3f;p=vlc

diff --git a/Makefile.am b/Makefile.am
index d3b5084f4e..5790052068 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ NULL =
 #  - . should come before mozilla/bindings because the plugin needs libvlc.a
 #  - po should come before . because VLC.app needs the pofiles
 #  - loader should come before modules because some plugins need it
-SUBDIRS = intl loader src modules po . mozilla bindings activex share m4 doc
+SUBDIRS = intl libs src modules po . mozilla bindings activex share m4 doc
 DIST_SUBDIRS = $(SUBDIRS)  ipkg
 
 EXTRA_DIST = \
@@ -188,7 +188,8 @@ EXTRA_DIST += \
 	extras/MacOSX/Resources/fs_exit_fullscreen.png \
 	extras/MacOSX/Resources/fs_background.png \
 	extras/MacOSX/fullscreen_panel.svg \
-	extras/MacOSX/vlc.pbproj/project.pbxproj \
+	extras/MacOSX/ub.sh \
+	extras/MacOSX/vlc.xcodeproj/project.pbxproj \
 	extras/MacOSX/Delete_Preferences.app/Contents/Info.plist \
 	extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \
 	extras/MacOSX/Delete_Preferences.app/Contents/MacOS/applet \
@@ -287,7 +288,7 @@ LIBVLC = src/$(LIB_libvlc)
 vlc_LDFLAGS =
 else
 if HAVE_WIN32
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` -Wl,-rpath $(libdir) -L$(top_builddir)/src -lvlc
+vlc_LDFLAGS = -L$(top_builddir)/src -lvlc `$(VLC_CONFIG) --libs vlc`
 LIB_libvlc = libvlc.dll.a
 LIBVLC =
 else
@@ -351,9 +352,10 @@ endif
 
 # Install the symlinks
 install-exec-local: install-binPROGRAMS
+	inst="`echo vlc | sed -e '$(transform)'`" ; \
 	for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
 	  rm -f "$(DESTDIR)$(bindir)/$$i" && \
-	  ln -sf vlc "$(DESTDIR)$(bindir)/$$i" ; \
+	  ln -sf "$${inst}" "$(DESTDIR)$(bindir)/$$i" ; \
 	fi ; done
 
 # the opposite of install-{data,exec}-local
@@ -432,20 +434,10 @@ VLC-release.app: vlc
 	  cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
 	done
-	case $(host_os) in \
-	  *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
-	    cd ../../../ && \
-	    cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
-	          $(top_builddir)/VLC-release.app;; \
-	  *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
-	    cd ../../../ && \
-	    cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
-	          $(top_builddir)/VLC-release.app;; \
-	  *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
+	cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
 	    cd ../../../ && \
 	    cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
-	          $(top_builddir)/VLC-release.app;; \
-	esac
+	          $(top_builddir)/VLC-release.app; \
 	rm -Rf $(top_builddir)/tmp
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
 	$(INSTALL) $(top_builddir)/vlc \
@@ -574,20 +566,10 @@ VLC.app: vlc
 	  cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
 	done
-	case $(host_os) in \
-	  *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'&& \
-	    cd ../../../ && \
-	    cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
-	          $(top_builddir)/VLC.app;; \
-	  *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'&& \
-	    cd ../../../ && \
-	    cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
-	          $(top_builddir)/VLC.app;; \
-	  *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
+	cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
 	    cd ../../../ && \
 	    cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
-	          $(top_builddir)/VLC.app;; \
-	esac
+	          $(top_builddir)/VLC.app; \
 	rm -Rf $(top_builddir)/tmp
 	$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
 	$(INSTALL) $(top_builddir)/vlc \
@@ -689,12 +671,16 @@ package-win-common:
 	mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/admin"
 	cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ;
 	unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;
+	cp $(srcdir)/share/http/.hosts $(top_builddir)/vlc-${VERSION}/http/ ;
+	unix2dos $(top_builddir)/vlc-${VERSION}/http/.hosts ;
 	cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ;
 	unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ;
 	cp $(srcdir)/share/http/js/*.js $(top_builddir)/vlc-${VERSION}/http/js/ ;
 	unix2dos $(top_builddir)/vlc-${VERSION}/http/js/*.js ;
 	cp $(srcdir)/share/http/dialogs/* $(top_builddir)/vlc-${VERSION}/http/dialogs/ ;
 	unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/* ;
+	cp $(srcdir)/share/http/dialogs/.hosts $(top_builddir)/vlc-${VERSION}/http/dialogs/ ;
+	unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/.hosts ;
 	cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ;
 	cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-${VERSION}/http/images/
 	cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ;
@@ -705,11 +691,13 @@ package-win-common:
 	cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-${VERSION}/http/old/ ;
 	unix2dos $(top_builddir)/vlc-${VERSION}/http/old/*.html ;
 	cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-${VERSION}/http/old/ ;
+	cp $(srcdir)/share/http/old/.hosts $(top_builddir)/vlc-${VERSION}/http/old/ ;
 	cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-${VERSION}/http/old/ ;
 	cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http/old/vlm/ ;
 	unix2dos $(top_builddir)/vlc-${VERSION}/http/old/vlm/*.html ;
 	cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-${VERSION}/http/old/admin/ ;
 	unix2dos $(top_builddir)/vlc-${VERSION}/http/old/admin/*.html ;
+	cp $(srcdir)/share/http/old/admin/.access $(top_builddir)/vlc-${VERSION}/http/old/admin/ ;
 
 	cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;