X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=49e38dc7bb40b3a61458e6fc6e258e61d05ea5b7;hb=4232e94712088389243b30b0b7f91eb01b27bd07;hp=3d099306b72c41bd9a6126109d4fc167fa6f11ac;hpb=a58afe8e62c672b06e047f2475e69977908dbb7d;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 3d099306b7..49e38dc7bb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -351,10 +351,11 @@ VLC-release.app: vlc
 	  echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \
 	  false; \
 	else \
-	  echo "OK."; mkdir -p "$(top_builddir)/tmp/extras"; \
+	  echo "OK."; mkdir -p "$(top_builddir)/tmp/extras/MacOSX"; \
 	fi
 	rm -Rf $(top_builddir)/VLC-release.app
-	cp -R $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
+	cp -R $(srcdir)/extras/MacOSX/vlc.xcodeproj $(top_builddir)/tmp/extras/MacOSX/
+	cp -R $(srcdir)/extras/MacOSX/Resources $(top_builddir)/tmp/extras/MacOSX
 	for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \
 	  cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
 	done
@@ -542,10 +543,11 @@ VLC.app: vlc
 	  echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \
 	  false; \
 	else \
-	  echo "OK."; mkdir -p "$(top_builddir)/tmp/extras"; \
+	  echo "OK."; mkdir -p "$(top_builddir)/tmp/extras/MacOSX"; \
 	fi
 	rm -Rf $(top_builddir)/VLC.app
-	cp -R $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
+	cp -R $(srcdir)/extras/MacOSX/vlc.xcodeproj $(top_builddir)/tmp/extras/MacOSX/
+	cp -R $(srcdir)/extras/MacOSX/Resources $(top_builddir)/tmp/extras/MacOSX
 	for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \
 	  cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
 	done
@@ -966,10 +968,6 @@ package-macosx:
 	echo "Create package directory: vlc-${VERSION}/";
 	mkdir -p "$(top_builddir)/vlc-${VERSION}/";
 
-# For now, export the framework for third parties, from here
-	(cd $(top_builddir)/extras/MacOSX/Framework && xcodebuild);
-	cp -r $(top_builddir)/extras/MacOSX/Framework/build/Release/VLC.framework $(top_builddir)/vlc-${VERSION}/VLC.framework
-
 # Copy relevant files 
 	@if test -e "$(top_builddir)/VLC-release.app/"; then \
 	  cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \
@@ -989,7 +987,7 @@ package-macosx:
 # Create disk image 
 	echo "Creating disk image" ;
 	rm -f "$(top_builddir)/vlc-${VERSION}.dmg" ;
-	hdiutil create -srcfolder "$(top_builddir)/vlc-${VERSION}" \
+	hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-${VERSION}" \
 	  "$(top_builddir)/vlc-${VERSION}.dmg" -format UDRW \
 	  -scrub -imagekey zlib-level=9 ;