* modules/gui/macosx/controls.m:

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 663dfa45ffdf9fdc7a86788022aeea16f8e6dfcb..0bbdfb871ef8aa1ca8d8e559ba8c4236630b076e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@
 SUBDIRS = po intl m4 share
 DIST_SUBDIRS = $(SUBDIRS) modules src debian doc ipkg lib
 
-EXTRA_DIST = FAQ HACKING MAINTAINERS THANKS src/extras/COPYING \
+EXTRA_DIST = HACKING MAINTAINERS src/extras/COPYING \
              INSTALL.win32 README.MacOSX.rtf vlc.spec install-win32 \
              Modules.am macosx-dmg \
              configure.ac.in mkinstalldirs bootstrap
@@ -207,7 +207,11 @@ include/vlc_symbols.h: Makefile $(HEADERS_include)
        echo '#ifdef __PLUGIN__' >> $@.in
        cat $(HEADERS_include) | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/#   define \2 p_symbols->\2_inner/' >> $@.in
        echo '#endif /* __PLUGIN__ */' >> $@.in
-       mv -f $@.in $@
+       if ! diff -q $@ $@.in; then \
+               mv -f $@.in $@ ; \
+       else \
+               rm -f $@.in ; \
+       fi
 
 src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include)
        rm -f $@.tmp && cp $@.in $@.tmp
@@ -215,7 +219,11 @@ src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_inclu
        echo '#define STORE_SYMBOLS( p_symbols ) \' >> $@.tmp
        cat $(HEADERS_include) | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/    (p_symbols)->\2_inner = \2; \\/' >> $@.tmp
        echo '' >> $@.tmp
-       mv -f $@.tmp $@
+       if ! diff -q $@ $@.tmp; then \
+               mv -f $@.tmp $@ ; \
+       else \
+               rm -f $@.tmp ; \
+       fi
 
 src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in
        rm -f $@.tmp && cp $@.in $@.tmp
@@ -231,7 +239,11 @@ if HAVE_BUILTINS
 endif
        echo "    } while( 0 );" >> $@.tmp
        echo "" >> $@.tmp
-       mv -f $@.tmp $@
+       if ! diff -q $@ $@.tmp; then \
+               mv -f $@.tmp $@ ; \
+       else \
+               rm -f $@.tmp ; \
+       fi
 
 # These dependencies are mandatory
 $(SOURCES): include/vlc_symbols.h
@@ -462,26 +474,26 @@ install-exec-local:
 
 if HAVE_DARWIN
 # Create the MacOS X app
-vlc_app_DATA = vlc.app
+vlc_app_DATA = VLC.app
 vlc_appdir = $(bindir)
-vlc.app: vlc $(PLUGIN_FILES)
-       rm -Rf vlc.app
+VLC.app: vlc $(PLUGIN_FILES)
+       rm -Rf VLC.app
        cd extras/MacOSX ; pbxbuild | grep -v '^[ \t]' | grep -v "^$$"
-       cp -r extras/MacOSX/build/vlc.bundle ./vlc.app
-       $(INSTALL) -d vlc.app/Contents/MacOS
-       $(INSTALL) vlc vlc.app/Contents/MacOS/
-       $(INSTALL) -d vlc.app/Contents/MacOS/modules
+       cp -r extras/MacOSX/build/vlc.bundle ./VLC.app
+       $(INSTALL) -d VLC.app/Contents/MacOS
+       $(INSTALL) vlc VLC.app/Contents/MacOS/VLC
+       $(INSTALL) -d VLC.app/Contents/MacOS/modules
        for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \
-               $(INSTALL) $$i vlc.app/Contents/MacOS/modules/ ; \
+               $(INSTALL) $$i VLC.app/Contents/MacOS/modules/ ; \
        fi ; done
-       $(INSTALL) -d vlc.app/Contents/MacOS/share
-       $(INSTALL) -m 644 share/*.psf share/*.rle vlc.app/Contents/MacOS/share
-       $(INSTALL) -d vlc.app/Contents/MacOS/locale
+       $(INSTALL) -d VLC.app/Contents/MacOS/share
+       $(INSTALL) -m 644 share/*.psf share/*.rle VLC.app/Contents/MacOS/share
+       $(INSTALL) -d VLC.app/Contents/MacOS/locale
        for i in $(CATALOGS); do \
-               mkdir -p vlc.app/Contents/MacOS/locale/$${i%.gmo}/LC_MESSAGES ; \
-               cp po/$$i vlc.app/Contents/MacOS/locale/$${i%.gmo}/LC_MESSAGES/vlc.mo || true ; \
+               mkdir -p VLC.app/Contents/MacOS/locale/$${i%.gmo}/LC_MESSAGES ; \
+               cp po/$$i VLC.app/Contents/MacOS/locale/$${i%.gmo}/LC_MESSAGES/vlc.mo || true ; \
        done
-       echo -n "APPLVLC#" >| vlc.app/Contents/PkgInfo
+       echo -n "APPLVLC#" >| VLC.app/Contents/PkgInfo
 endif
 
 if HAVE_WIN32
@@ -512,7 +524,7 @@ package-win32:
        cp vlc.exe tmp/ 
        $(STRIP) tmp/vlc.exe
        cp INSTALL.win32 tmp/INSTALL.txt ; unix2dos tmp/INSTALL.txt
-       for file in AUTHORS COPYING ChangeLog README FAQ ; \
+       for file in AUTHORS COPYING ChangeLog README THANKS NEWS ; \
                        do cp $$file tmp/$${file}.txt ; \
                        unix2dos tmp/$${file}.txt ; done
        mkdir tmp/plugins
@@ -544,7 +556,7 @@ package-beos:
        cp vlc tmp/vlc/
        $(STRIP) tmp/vlc/vlc
        xres -o tmp/vlc/vlc ./share/vlc_beos.rsrc
-       cp AUTHORS COPYING ChangeLog README FAQ tmp/vlc/
+       cp AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/
        for file in default8x16.psf default8x9.psf ; \
                do cp share/$$file tmp/vlc/share/ ; done
        mkdir tmp/vlc/plugins
@@ -569,8 +581,8 @@ package-macosx:
        fi
 
 # Copy relevant files 
-       cp -R vlc.app tmp/
-       cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf FAQ tmp/
+       cp -R VLC.app tmp/
+       cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS tmp/
 
 # Create disk image 
        ./macosx-dmg 18 "vlc-${VERSION}" tmp/*