MacOS X

make vlc.app now correctly updates vlc.app
added an icon to the MacOS X vlc
removed the build of the vlc app from the install target

diff --git a/Makefile.in b/Makefile.in
index 2a682b81e79f92b592318f0526407048f010f7a7..4bb439ad5b752544b465334f566507056e255604 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -510,19 +510,6 @@ install:
        $(INSTALL) -m 644 share/*.png $(DESTDIR)$(datadir)/videolan
        $(INSTALL) -m 644 share/*.xpm $(DESTDIR)$(datadir)/videolan
 
-ifneq (,$(findstring darwin,$(SYS)))
-# XXX this should only be for MacOS X
-#should the following be "$(DESTDIR)$(bindir)vlc.app/" or "$(DESTDIR)vlc.app/" ?
-       mkdir -p $(DESTDIR)$(bindir)vlc.app/Contents/MacOS
-       mkdir -p $(DESTDIR)$(bindir)vlc.app/Contents/MacOS/lib
-       mkdir -p $(DESTDIR)$(bindir)vlc.app/Contents/MacOS/share
-       $(INSTALL) -m 644 extras/MacOSX_app/Contents/Info.plist $(DESTDIR)$(bindir)vlc.app/Contents/
-       $(INSTALL) -m 644 extras/MacOSX_app/Contents/PkgInfo $(DESTDIR)$(bindir)vlc.app/Contents/
-       $(INSTALL) vlc $(DESTDIR)$(bindir)vlc.app/Contents/MacOS/
-       $(INSTALL) $(PLUGINS:%=lib/%.so) $(DESTDIR)$(bindir)vlc.app/Contents/MacOS/lib
-       $(INSTALL) -m 644 share/*.psf $(DESTDIR)$(bindir)vlc.app/Contents/MacOS/share
-endif
-
 show:
        @echo CC: $(CC)
        @echo CFLAGS: $(CFLAGS)
@@ -583,6 +570,21 @@ snapshot:
 
 plugins: $(PLUGINS:%=lib/%.so)
 
+.PHONY: vlc.app
+vlc.app:
+ifneq (,$(findstring darwin,$(SYS)))
+       rm -rf vlc.app
+       mkdir -p vlc.app/Contents/Resources
+       mkdir -p vlc.app/Contents/MacOS/lib
+       mkdir -p vlc.app/Contents/MacOS/share
+       $(INSTALL) -m 644 extras/MacOSX_app/Contents/Info.plist vlc.app/Contents/
+       $(INSTALL) -m 644 extras/MacOSX_app/Contents/PkgInfo vlc.app/Contents/
+       $(INSTALL) vlc vlc.app/Contents/MacOS/
+       $(INSTALL) share/vlc.icns vlc.app/Contents/Resources/
+       $(INSTALL) $(PLUGINS:%=lib/%.so) vlc.app/Contents/MacOS/lib
+       $(INSTALL) -m 644 share/*.psf vlc.app/Contents/MacOS/share
+endif
+
 FORCE:
 
 #
@@ -691,18 +693,6 @@ ifeq ($(SYS),beos)
        mimeset -f $@
 endif
 
-vlc.app:
-ifneq (,$(findstring darwin,$(SYS)))
-       mkdir -p vlc.app/Contents/MacOS
-       mkdir -p vlc.app/Contents/MacOS/lib
-       mkdir -p vlc.app/Contents/MacOS/share
-       $(INSTALL) -m 644 extras/MacOSX_app/Contents/Info.plist vlc.app/Contents/
-       $(INSTALL) -m 644 extras/MacOSX_app/Contents/PkgInfo vlc.app/Contents/
-       $(INSTALL) vlc vlc.app/Contents/MacOS/
-       $(INSTALL) $(PLUGINS:%=lib/%.so) vlc.app/Contents/MacOS/lib
-       $(INSTALL) -m 644 share/*.psf vlc.app/Contents/MacOS/share
-endif
-
 #
 # Plugin targets
 #

diff --git a/share/vlc.icns b/share/vlc.icns
new file mode 100644 (file)
index 0000000..b624528
Binary files /dev/null and b/share/vlc.icns differ