]> git.sesse.net Git - vlc/blobdiff - Makefile.am
* extras/MacOSX/Resources/English.lproj/MainMenu.nib/*
[vlc] / Makefile.am
index 0bbdfb871ef8aa1ca8d8e559ba8c4236630b076e..9f83e0e560ef026f64954b589c8598fe77b1d0a2 100644 (file)
@@ -2,20 +2,31 @@
 # Automake targets and declarations
 ###############################################################################
 
+NULL =
+
 # SUBDIRS stores the directories where a "make" is required when building
 # something. DIST_SUBDIRS stores the directories where nothing is built but
 # which have makefiles with distribution information.
 SUBDIRS = po intl m4 share
-DIST_SUBDIRS = $(SUBDIRS) modules src debian doc ipkg lib
+DIST_SUBDIRS = $(SUBDIRS) modules src debian doc ipkg lib autotools
+
+EXTRA_DIST = \
+       HACKING \
+       INSTALL.win32 \
+       MAINTAINERS \
+       Modules.am \
+       README.MacOSX.rtf \
+       bootstrap \
+       configure.ac.in \
+       install-win32 \
+       src/extras/COPYING \
+       toolbox \
+       vlc.spec \
+       $(NULL)
 
-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
 MOSTLYCLEANFILES =
 BUILT_SOURCES =
 SUFFIXES = 
-NULL =
 
 # List of programs, libraries and headers that need to be built and/or
 # distributed. Initialized to empty because we'll use += later.
@@ -170,6 +181,7 @@ HEADERS_include = \
        include/interface.h \
        include/intf_eject.h \
        include/iso_lang.h \
+       include/httpd.h \
        include/main.h \
        include/mmx.h \
        include/modules.h \
@@ -192,6 +204,7 @@ HEADERS_include = \
        include/vlc_threads.h \
        include/vlc_threads_funcs.h \
        include/win32_specific.h \
+       include/osd.h \
        $(NULL)
 
 HEADERS_include_built = \
@@ -199,51 +212,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
@@ -284,9 +259,13 @@ EXTRA_DIST += \
        extras/MacOSX/Resources/pause.png \
        extras/MacOSX/Resources/play.png \
        extras/MacOSX/Resources/prefs.png \
+       extras/MacOSX/Resources/slow.png \
        extras/MacOSX/Resources/stop.png \
        extras/MacOSX/Resources/vlc_hg.png \
+       extras/MacOSX/Resources/vlc.scriptSuite \
+       extras/MacOSX/Resources/English.lproj/vlc.scriptTerminology \
        extras/MacOSX/vlc.pbproj/project.pbxproj \
+       extras/MacOSX/macosx-dmg \
        $(NULL)
 
 ###############################################################################
@@ -489,9 +468,9 @@ VLC.app: vlc $(PLUGIN_FILES)
        $(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 ; \
+       for i in $(ALL_LINGUAS); do \
+               mkdir -p VLC.app/Contents/MacOS/locale/$${i%}/LC_MESSAGES ; \
+               cp po/$${i}.gmo VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
        done
        echo -n "APPLVLC#" >| VLC.app/Contents/PkgInfo
 endif
@@ -524,19 +503,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
@@ -585,7 +575,7 @@ package-macosx:
        cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS tmp/
 
 # Create disk image 
-       ./macosx-dmg 18 "vlc-${VERSION}" tmp/* 
+       ./extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" tmp/* 
 
 # Clean up
        rm -Rf tmp