Fixed aspect ratio's tooltip.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f50f4e862406855bfc553e24c2d8e586d1faba47..8f1f99040994b55ca6a624a4cb3150022d5ffe76 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -200,51 +200,13 @@ HEADERS_include_built = \
        $(NULL)
 
 include/vlc_symbols.h: Makefile $(HEADERS_include)
-       rm -f $@.in
-       echo '/* DO NOT EDIT THIS FILE! See Makefile.am */' >> $@.in
-       echo 'struct module_symbols_t {' >> $@.in
-       cat $(HEADERS_include) | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/    \1 (* \2_inner) \3;/' >> $@.in
-       echo '};' >> $@.in
-       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
-       if ! diff -q $@ $@.in; then \
-               mv -f $@.in $@ ; \
-       else \
-               rm -f $@.in ; \
-       fi
+       ./toolbox --update-includes $(BUILTINS)
 
 src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include)
-       rm -f $@.tmp && cp $@.in $@.tmp
-       sed -e 's#.*\$[I][d]:.*# * Automatically generated from '$@'.in by bootstrap#' < $@.in > $@.tmp
-       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
-       if ! diff -q $@ $@.tmp; then \
-               mv -f $@.tmp $@ ; \
-       else \
-               rm -f $@.tmp ; \
-       fi
+       ./toolbox --update-includes $(BUILTINS)
 
 src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in
-       rm -f $@.tmp && cp $@.in $@.tmp
-if HAVE_BUILTINS
-       for i in $(BUILTINS) ; do echo "int vlc_entry__"`echo $$i | sed -e 'y@/@_@' -e 's@\..*@@'`"( module_t* );" >>$@.tmp; done
-       echo "" >> $@.tmp
-endif
-       echo "#define ALLOCATE_ALL_BUILTINS() \\" >> $@.tmp
-       echo "    do \\" >> $@.tmp
-       echo "    { \\" >> $@.tmp
-if HAVE_BUILTINS
-       for i in $(BUILTINS) ; do echo "        ALLOCATE_BUILTIN("`echo $$i | sed -e 'y@/@_@' -e 's@\..*@@'`"); \\" >> $@.tmp ; done
-endif
-       echo "    } while( 0 );" >> $@.tmp
-       echo "" >> $@.tmp
-       if ! diff -q $@ $@.tmp; then \
-               mv -f $@.tmp $@ ; \
-       else \
-               rm -f $@.tmp ; \
-       fi
+       ./toolbox --update-includes $(BUILTINS)
 
 # These dependencies are mandatory
 $(SOURCES): include/vlc_symbols.h
@@ -525,19 +487,30 @@ 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 THANKS NEWS ; \
+       for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
                        do cp $$file tmp/$${file}.txt ; \
                        unix2dos tmp/$${file}.txt ; done
+
        mkdir tmp/plugins
        for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \
                $(INSTALL) $$i tmp/plugins/ ; \
        fi ; done
-# don't include these two
-#rm -f tmp/plugins/gtk.so tmp/plugins/sdl.so
-       for i in dummy tmp/plugins/*$(LIBEXT) ; do if test $$i != tmp/plugins/intfwin.so -a $$i != dummy ; then $(STRIP) $$i ; fi ; done
+
+       for i in dummy tmp/plugins/*$(LIBEXT) ; \
+               do if test $$i != tmp/plugins/libwin32_plugin$(LIBEXT) \
+               -a $$i != dummy ; then $(STRIP) $$i ; fi ; done
        mkdir tmp/share
-       for file in default8x16.psf default8x9.psf ; \
-               do cp share/$$file tmp/share/ ; done
+       cp share/*.rle tmp/share/ ;
+
+       mkdir tmp/locale
+       for i in $(ALL_LINGUAS); do \
+               mkdir -p tmp/locale/$${i}/LC_MESSAGES ; \
+               cp po/$${i}.gmo tmp/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+       done
+
+       cd doc/faq ; $(MAKE) html ; cd ../.. ;
+       cp doc/faq/index.html tmp/FAQ.htm ;
+
 # Create package 
        wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} tmp/nsi
 # Clean up