X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=dd6347a817253c357639857fafad342c2e4ddc62;hb=f49d85712b344182c6e4bae359bebc8b4360c737;hp=42e9f0b2167d39619710cdab52dc491724a89e12;hpb=72a42b973f33ed907a9ff806f429476c9011e39b;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 42e9f0b216..dd6347a817 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@ EXTRA_DIST = \
 	toolbox \
 	vlc-api.pl \
 	vlc-config.in.in \
-	vlc.fedora4.spec \
+	vlc.fedora.spec \
 	vlc.mandriva.spec \
 	vlc.altlinux.spec \
 	vlc.win32.nsi.in \
@@ -187,6 +187,7 @@ EXTRA_DIST += \
 	extras/MacOSX/Resources/fs_exit_fullscreen_highlight.png \
 	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/Delete_Preferences.app/Contents/Info.plist \
 	extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \
@@ -303,14 +304,14 @@ endif
 # Shortcut for developpers to rebuild the core (libvlc + vlc)
 # Don't use it if you don't know what it is about.
 # Don't complain if it doesn't work. -- Courmisch
-core:
-	rm -f src/$(LIB_libvlc)
-	$(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
+libvlc:
+	cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
 
-.PHONY: core
+core: libvlc vlc$(EXEEXT)
 
-src/$(LIB_libvlc):
-	cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
+.PHONY: libvlc core
+
+src/$(LIB_libvlc): libvlc
 
 vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
 	@rm -f vlc$(EXEEXT)
@@ -433,16 +434,16 @@ VLC-release.app: vlc
              $(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 ../../../; \
+	  *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 ../../../; \
+	  *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 ../../../; \
+	  *darwin8*) 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
@@ -575,16 +576,16 @@ VLC.app: vlc
              $(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 ../../../; \
+	  *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 ../../../; \
+	  *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 ../../../; \
+	  *darwin8*) 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
@@ -858,7 +859,7 @@ package-beos:
 	xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
 	find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;
 	mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ;
-	(cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} )
+	(cd $(srcdir)/tmp && zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} )
 	mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/ ;
 	mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc ;
 
@@ -869,7 +870,7 @@ package-beos:
 	xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
 	find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;
 	mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ;
-	(cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} )
+	(cd $(srcdir)/tmp &&  zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} )
 	mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/ ;
 
 # Clean up
@@ -885,7 +886,11 @@ package-macosx:
 	mkdir -p "$(top_builddir)/vlc-${VERSION}/";
 
 # Copy relevant files 
-	cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"
+	@if test -e "$(top_builddir)/VLC-release.app/"; then \
+	  cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \
+	else \
+	  cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \
+	fi
 	cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/vlc-${VERSION}/ && cp -R extras/MacOSX/Delete_Preferences.app $(top_builddir)/vlc-${VERSION}/
 
 # Create disk image 
@@ -961,7 +966,7 @@ package-translations:
 update-po:
 	rm -f $(top_srcdir)/po/POTFILES.in
 	{ \
-	  cd $(top_srcdir) ; \
+	  cd $(top_srcdir) && \
 	  echo "# automatically created by make update-po" ; \
 	  echo "" ; \
 	  echo "# main sources" ; \