X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=9f83e0e560ef026f64954b589c8598fe77b1d0a2;hb=98943979933bf2170f04fcfa219306ead725fc1c;hp=9316de2b82cab717a2d3bcaf984522f88b19754c;hpb=d65301abfbc6cb4ec8b72b0c3e25e7ad5ae0230e;p=vlc diff --git a/Makefile.am b/Makefile.am index 9316de2b82..9f83e0e560 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 = FAQ HACKING MAINTAINERS STATUS 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. @@ -32,7 +43,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 +128,9 @@ CFLAGS_nodebug = @CFLAGS_OPTIM_NODEBUG@ endif endif endif +else +# !OPTIM +CFLAGS_optim = @CFLAGS_NOOPTIM@ endif CPPFLAGS_default += $(CPPFLAGS_release) \ @@ -160,12 +174,14 @@ 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 \ include/interface.h \ include/intf_eject.h \ include/iso_lang.h \ + include/httpd.h \ include/main.h \ include/mmx.h \ include/modules.h \ @@ -188,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 = \ @@ -195,39 +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 - mv -f $@.in $@ + ./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 - mv -f $@.tmp $@ + ./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 - mv -f $@.tmp $@ + ./toolbox --update-includes $(BUILTINS) # These dependencies are mandatory $(SOURCES): include/vlc_symbols.h @@ -260,12 +251,21 @@ EXTRA_DIST += \ extras/MacOSX/Resources/mpeg2.icns \ extras/MacOSX/Resources/mpeg4.icns \ extras/MacOSX/Resources/vlc.icns \ + extras/MacOSX/Resources/back.png \ + extras/MacOSX/Resources/begin.png \ + extras/MacOSX/Resources/end.png \ + extras/MacOSX/Resources/forw.png \ + extras/MacOSX/Resources/list.png \ 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/stepf.png \ - extras/MacOSX/Resources/stepr.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) ############################################################################### @@ -277,19 +277,19 @@ EXTRA_DIST += \ msvc/libvlc.dsp.in \ msvc/plugins.dsp.in \ msvc/vlc.dsp.in \ - msvc/config.h \ + msvc/config.h.in \ msvc/modules_builtin_msvc.h \ evc/vlc.vcw \ evc/libvlc.vcp.in \ evc/vlc.vcp.in \ evc/plugins.vcp.in \ evc/vlc.c \ - evc/config.h \ + evc/config.h.in \ evc/modules_builtin_evc.h \ $(NULL) show-libvlc-sources: FORCE - @echo X: $(SOURCES_libvlc_common) $(SOURCES_libvlc_win32) $(SOURCES_libvlc_dirent) $(SOURCES_libvlc_getopt) $(SOURCES_libvlc_libc) + @echo X: $(SOURCES_libvlc_common) $(SOURCES_libvlc_win32) $(SOURCES_libvlc_dirent) $(SOURCES_libvlc_getopt) show-libvlc-headers: FORCE @echo X: $(HEADERS_include) $(HEADERS_include_built) @@ -308,10 +308,12 @@ lib_LIBRARIES += lib/libvlc.a $(LIBRARIES_libvlc_pic) lib_libvlc_a_SOURCES = $(SOURCES_libvlc) lib_libvlc_a_CFLAGS = $(CPPFLAGS_default) -D__VLC__ $(CFLAGS_default) @CFLAGS_vlc@ lib_libvlc_a_CXXFLAGS = $(CPPFLAGS_default) -D__VLC__ $(CXXFLAGS_default) +lib_libvlc_a_OBJCFLAGS = $(CPPFLAGS_default) -D__VLC__ $(OBJCFLAGS_default) lib_libvlc_pic_a_SOURCES = $(SOURCES_libvlc) lib_libvlc_pic_a_CFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(CFLAGS_pic) @CFLAGS_vlc@ lib_libvlc_pic_a_CXXFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(CXXFLAGS_pic) +lib_libvlc_pic_a_OBJCFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(OBJCFLAGS_pic) if HAVE_BEOS OPT_SOURCES_libvlc_beos = $(SOURCES_libvlc_beos) @@ -328,9 +330,6 @@ endif if BUILD_GETOPT OPT_SOURCES_libvlc_getopt = $(SOURCES_libvlc_getopt) endif -if BUILD_LIBC -OPT_SOURCES_libvlc_libc = $(SOURCES_libvlc_libc) -endif if BUILD_MOZILLA LIBRARIES_libvlc_pic = lib/libvlc_pic.a endif @@ -341,7 +340,6 @@ EXTRA_DIST += \ $(SOURCES_libvlc_win32) \ $(SOURCES_libvlc_dirent) \ $(SOURCES_libvlc_getopt) \ - $(SOURCES_libvlc_libc) \ $(NULL) SOURCES_libvlc_beos = \ @@ -349,7 +347,7 @@ SOURCES_libvlc_beos = \ $(NULL) SOURCES_libvlc_darwin = \ - src/misc/darwin_specific.c \ + src/misc/darwin_specific.m \ $(NULL) SOURCES_libvlc_win32 = \ @@ -367,10 +365,6 @@ SOURCES_libvlc_getopt = \ src/extras/getopt1.c \ $(NULL) -SOURCES_libvlc_libc = \ - src/extras/libc.c - $(NULL) - SOURCES_libvlc_common = \ src/libvlc.c \ src/libvlc.h \ @@ -411,6 +405,7 @@ SOURCES_libvlc_common = \ src/misc/objects.c \ src/misc/variables.c \ src/misc/error.c \ + src/extras/libc.c \ $(NULL) SOURCES_libvlc = \ @@ -420,7 +415,6 @@ SOURCES_libvlc = \ $(OPT_SOURCES_libvlc_win32) \ $(OPT_SOURCES_libvlc_dirent) \ $(OPT_SOURCES_libvlc_getopt) \ - $(OPT_SOURCES_libvlc_libc) \ $(NULL) ############################################################################### @@ -459,25 +453,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 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 + $(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 $(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 if HAVE_WIN32 @@ -508,21 +503,32 @@ 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 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/*.so ; 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} /CD tmp/nsi + wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} tmp/nsi # Clean up rm -Rf tmp @@ -540,14 +546,14 @@ 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 for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \ $(INSTALL) $$i tmp/vlc/plugins/ ; \ fi ; done - for i in dummy tmp/vlc/plugins/*.so ; do if test $$i != dummy ; then $(STRIP) $$i ; fi ; done + for i in dummy tmp/vlc/plugins/*$(LIBEXT) ; do if test $$i != dummy ; then $(STRIP) $$i ; fi ; done # Create package mv tmp/vlc tmp/vlc-${VERSION} (cd tmp ; find vlc-${VERSION} | \ @@ -565,11 +571,11 @@ 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/* + ./extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" tmp/* # Clean up rm -Rf tmp @@ -614,7 +620,7 @@ if UNTRUE noinst_LIBRARIES_mozilla = mozilla/libplugin.a endif -mozilla_libplugin_a_SOURCES = $(SOURCES_mozilla) $(BUILT_SOURCES_mozilla) +mozilla_libplugin_a_SOURCES = $(SOURCES_mozilla) mozilla_libplugin_a_CFLAGS = $(CPPFLAGS_pic) $(CFLAGS_pic) \ $(CPPFLAGS_mozilla) $(CFLAGS_mozilla) \ $(CPPFLAGS_mozilla_EXTRA)