X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=9f0c54eb2d3ccd97a8d30c550878efa489352edf;hb=8d45c8ecf1023a56c3467870de244a7a01e529b7;hp=b45f344dd6df5870757a66bda75fbb0ad604f105;hpb=10fb66c935d6598b96ae6c25b3f9c241f549ced2;p=vlc

diff --git a/Makefile.am b/Makefile.am
index b45f344dd6..9f0c54eb2d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@
 #  - libs/* are needed by modules
 SUBDIRS = po libs/loader libs/srtp src modules \
 		projects/mozilla bindings projects/activex share doc
-DIST_SUBDIRS = $(SUBDIRS) extras/buildsystem/autotools/m4 extras/package/ipkg
+DIST_SUBDIRS = $(SUBDIRS) m4  extras/package/ipkg
 
 EXTRA_DIST = \
 	HACKING \
@@ -216,7 +216,7 @@ EXTRA_DIST += \
 	extras/analyser/emacs.init \
 	extras/analyser/vlc.vim \
 	extras/analyser/valgrind.suppressions \
-	extras/buildsystem/autotools/make.pl \
+	extras/buildsystem/make.pl \
 	extras/buildsystem/autotools/m4/autoconf260.m4 \
 	extras/misc/mpris.py \
 	extras/misc/mpris.glade
@@ -352,12 +352,13 @@ noinst_DATA = VLC.app
 # VLC-release.app is the old VLC.app target
 VLC-release.app: vlc
 	( cd src && make install )
-	if test -e $(top_builddir)/tmp ; then rm -Rf $(top_builddir)/tmp; fi
-	mkdir -p "$(top_builddir)/tmp/extras/package/macosx"; \
+	rm -Rf "$(top_builddir)/tmp"
+	mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
 	rm -Rf $(top_builddir)/VLC-release.app
-	cp -R $(srcdir)/extras/package/macosx/vlc.xcodeproj $(top_builddir)/tmp/extras/package/macosx/
-	cp -R $(srcdir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx
-	for i in AUTHORS COPYING extras/package/macosx/README.MacOSX.rtf THANKS; do \
+	for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
+	  cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
+	done
+	for i in AUTHORS COPYING THANKS; do \
 	  cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
 	done
 	mkdir -p $(top_builddir)/tmp/modules/audio_output
@@ -414,7 +415,7 @@ VLC-release.app: vlc
              $(top_builddir)/tmp/modules/gui/macosx; \
 	done
 	cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
-	    cd ../../../ && \
+	    cd ../../../../ && \
 	    cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \
 	          $(top_builddir)/VLC-release.app; \
 	rm -Rf $(top_builddir)/tmp
@@ -446,28 +447,28 @@ VLC-release.app: vlc
 	$(INSTALL) -m 644 $(srcdir)/share/http-lua/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/.hosts
 	for i in $(srcdir)/share/http-lua/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http-lua/dialogs/* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/dialogs/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http-lua/js/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/js/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http-lua/old/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http-lua/old/admin/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/admin/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http-lua/old/vlm/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/vlm/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http-lua/images/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/images/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http-lua/requests/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/`basename $${i}` ; \
-	done ; \
+	done
 	$(INSTALL) -m 644 $(srcdir)/share/http-lua/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/readme.txt
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js
@@ -480,28 +481,28 @@ VLC-release.app: vlc
 	$(INSTALL) -m 644 $(srcdir)/share/http/old/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/.hosts
 	for i in $(srcdir)/share/http/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http/dialogs/* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http/js/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http/old/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http/old/admin/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http/old/vlm/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http/images/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images/`basename $${i}` ; \
-	done ; \
+	done
 	for i in $(srcdir)/share/http/requests/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/`basename $${i}` ; \
-	done ; \
+	done
 	$(INSTALL) -m 644 $(srcdir)/share/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/readme.txt
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/locale
 	cat $(top_srcdir)/po/LINGUAS | while read i; do \
@@ -519,12 +520,13 @@ VLC-release.app: vlc
 
 VLC.app: vlc 
 	( cd src && make install )
-	if test -e $(top_builddir)/tmp ; then rm -Rf $(top_builddir)/tmp; fi
-	mkdir -p "$(top_builddir)/tmp/extras/package/macosx"; \
+	rm -Rf $(top_builddir)/tmp
+	mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
 	rm -Rf $(top_builddir)/VLC.app
-	cp -R $(srcdir)/extras/package/macosx/vlc.xcodeproj $(top_builddir)/tmp/extras/package/macosx/
-	cp -R $(srcdir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx
-	for i in AUTHORS COPYING extras/package/macosx/README.MacOSX.rtf THANKS; do \
+	for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
+	  cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
+	done
+	for i in AUTHORS COPYING THANKS; do \
 	  cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
 	done
 	mkdir -p $(top_builddir)/tmp/modules/audio_output
@@ -581,9 +583,9 @@ VLC.app: vlc
              $(top_builddir)/tmp/modules/gui/macosx; \
 	done
 	cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
-	    cd ../../../ && \
+	    cd ../../../../ && \
 	    cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \
-	          $(top_builddir)/VLC.app; \
+	          $(top_builddir)/VLC.app
 	rm -Rf $(top_builddir)/tmp
 	$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
 	$(INSTALL) $(top_builddir)/.libs/vlc \
@@ -599,7 +601,7 @@ VLC.app: vlc
 	$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale
 	cat $(top_srcdir)/po/LINGUAS | while read i; do \
 	  mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
-	  ln -sfn `pwd`/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+	  ln -sfn `pwd`/$(srcdir)/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
 	  mkdir -p $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
 	  ln -sf ../English.lproj/InfoPlist.strings \
 	      $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
@@ -742,7 +744,7 @@ if BUILD_ACTIVEX
 	cp $(srcdir)/projects/activex/test.html  $(top_builddir)/vlc-$(VERSION)/activex/ ;
 	unix2dos $(top_builddir)/vlc-$(VERSION)/activex/* ;
 
-	cp $(top_builddir)/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/activex/ ;
+	cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/activex/ ;
 endif
 # Rebase all those DLLs to speed up loading (need cygwin rebase)
 	if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \