* restored old deinterlace menu. The on the fly code does not work as long

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6fffb5a0f860cd601eea8507ca6ab2ac37ee9bca..a86d3cd8cfd559c528db8d829be16017869a8189 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 STATUS 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
@@ -32,7 +32,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 # XXX: these flags could be set in configure.ac.in, but we set them here
 # because old versions of automake don't support them in configure.ac.
-AUTOMAKE_OPTIONS = foreign dist-bzip2 subdir-objects
+AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects
 
 ###############################################################################
 # Compilation flags for debug mode, profiling, and others
@@ -117,6 +117,9 @@ CFLAGS_nodebug = @CFLAGS_OPTIM_NODEBUG@
 endif
 endif
 endif
+else
+# !OPTIM
+CFLAGS_optim = @CFLAGS_NOOPTIM@
 endif
 
 CPPFLAGS_default += $(CPPFLAGS_release) \
@@ -160,6 +163,7 @@ HEADERS_include = \
        include/darwin_specific.h \
        include/codecs.h \
        include/error.h \
+       include/encoder.h \
        include/input_ext-dec.h \
        include/input_ext-intf.h \
        include/input_ext-plugins.h \
@@ -203,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
@@ -211,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
@@ -227,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
@@ -508,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
@@ -540,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
@@ -566,7 +582,7 @@ package-macosx:
 
 # Copy relevant files 
        cp -R vlc.app tmp/
-       cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf FAQ tmp/
+       cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS tmp/
 
 # Create disk image 
        ./macosx-dmg 18 "vlc-${VERSION}" tmp/*