X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=c5b4f7cb235e67bc7a881368de913c4f7a761a06;hb=ef235f269c9c766ad296466a4b5461d053bc6efe;hp=dd2623d235df1ae380d827dfab9f8263f83b4d55;hpb=ba0d4ba774ac86bc482e85e21699c4c7cf4c4869;p=vlc diff --git a/Makefile.am b/Makefile.am index dd2623d235..c5b4f7cb23 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,7 @@ NULL = # - modules should come before . because vlc needs the builtins # - . should come before mozilla because the plugin needs libvlc_pic.a # - po should come before . because VLC.app needs the pofiles -SUBDIRS = intl modules po . mozilla share m4 doc +SUBDIRS = intl modules po . mozilla activex share m4 doc DIST_SUBDIRS = $(SUBDIRS) src debian ipkg lib EXTRA_DIST = \ @@ -99,8 +99,10 @@ HEADERS_include = \ include/vlc_es.h \ include/vlc_es_out.h \ include/vlc_filter.h \ - include/vlc_help.h \ + include/vlc_config_cat.h \ include/vlc_httpd.h \ + include/vlc_tls.h \ + include/vlc_image.h \ include/vlc_input.h \ include/vlc_interface.h \ include/vlc_keys.h \ @@ -108,11 +110,14 @@ HEADERS_include = \ include/vlc_meta.h \ include/vlc_objects.h \ include/vlc_playlist.h \ + include/vlc_spu.h \ include/vlc_stream.h \ include/vlc_threads_funcs.h \ include/vlc_threads.h \ include/vlc_video.h \ include/vlc_vlm.h \ + include/vlc_vod.h \ + include/vlc_xml.h \ include/vout_synchro.h \ include/win32_specific.h \ $(NULL) @@ -121,13 +126,13 @@ HEADERS_include_built = \ include/vlc_symbols.h \ $(NULL) -include/vlc_symbols.h: Makefile $(HEADERS_include) +include/vlc_symbols.h: Makefile $(HEADERS_include) vlc-config srcdir=$(srcdir) $(srcdir)/toolbox --update-includes -src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include) +src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include) vlc-config srcdir=$(srcdir) $(srcdir)/toolbox --update-includes -src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in +src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in vlc-config srcdir=$(srcdir) $(srcdir)/toolbox --update-includes # These dependencies are mandatory @@ -153,6 +158,15 @@ EXTRA_DIST += \ extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib \ extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib \ extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib \ + extras/MacOSX/Resources/English.lproj/About.nib/classes.nib \ + extras/MacOSX/Resources/English.lproj/About.nib/info.nib \ + extras/MacOSX/Resources/English.lproj/About.nib/keyedobjects.nib \ + extras/MacOSX/Resources/English.lproj/Open.nib/classes.nib \ + extras/MacOSX/Resources/English.lproj/Open.nib/info.nib \ + extras/MacOSX/Resources/English.lproj/Open.nib/keyedobjects.nib \ + extras/MacOSX/Resources/English.lproj/Preferences.nib/classes.nib \ + extras/MacOSX/Resources/English.lproj/Preferences.nib/info.nib \ + extras/MacOSX/Resources/English.lproj/Preferences.nib/keyedobjects.nib \ extras/MacOSX/Resources/English.lproj/InfoPlist.strings \ extras/MacOSX/Resources/English.lproj/vlc.scriptTerminology \ extras/MacOSX/Resources/a52.icns \ @@ -234,7 +248,7 @@ EXTRA_DIST += \ evc/libvlc.vcp.in \ evc/vlc.vcp.in \ evc/plugins.vcp.in \ - evc/vlc.c \ + evc/errno.h \ evc/config.h.in \ evc/modules_builtin_evc.h \ $(NULL) @@ -242,12 +256,20 @@ EXTRA_DIST += \ dist-hook: cp $(distdir)/vlc.ebuild $(distdir)/vlc-${VERSION}.ebuild cd $(distdir) && srcdir=$(srcdir) $(srcdir)/toolbox --update-vc + distdir=$(distdir) srcdir=$(srcdir) $(srcdir)/toolbox --dist-contrib ############################################################################### # Building libvlc ############################################################################### bin_SCRIPTS = vlc-config +vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in + cd $(top_builddir) && $(SHELL) ./config.status --file=$@ + -cd $(top_builddir) && chmod 0755 $@ + +$(SOURCES): vlc-config + +CLEANFILES = $(BUILT_SOURCES) lib_LIBRARIES = lib/libvlc.a $(LIBRARIES_libvlc_pic) @@ -271,6 +293,9 @@ endif if HAVE_WIN32 OPT_SOURCES_libvlc_win32 = $(SOURCES_libvlc_win32) endif +if HAVE_WINCE +OPT_SOURCES_libvlc_win32 = $(SOURCES_libvlc_win32) +endif if BUILD_DIRENT OPT_SOURCES_libvlc_dirent = $(SOURCES_libvlc_dirent) endif @@ -305,7 +330,6 @@ SOURCES_libvlc_win32 = \ SOURCES_libvlc_dirent = \ src/extras/dirent.c \ - src/extras/dirent.h \ $(NULL) SOURCES_libvlc_getopt = \ @@ -322,10 +346,10 @@ SOURCES_libvlc_common = \ src/playlist/playlist.c \ src/playlist/sort.c \ src/playlist/loadsave.c \ - src/playlist/group.c \ + src/playlist/view.c \ src/playlist/item.c \ src/playlist/item-ext.c \ - src/playlist/info.c \ + src/playlist/services_discovery.c \ src/input/access.c \ src/input/clock.c \ src/input/control.c \ @@ -335,6 +359,7 @@ SOURCES_libvlc_common = \ src/input/input.c \ src/input/input_internal.h \ src/input/stream.c \ + src/input/mem_stream.c \ src/input/subtitles.c \ src/input/var.c \ src/video_output/video_output.c \ @@ -357,12 +382,14 @@ SOURCES_libvlc_common = \ src/stream_output/sap.c \ src/misc/charset.c \ src/misc/httpd.c \ + src/misc/tls.c \ src/misc/mtime.c \ src/misc/block.c \ src/misc/modules.c \ src/misc/threads.c \ src/misc/cpu.c \ src/misc/configuration.c \ + src/misc/image.c \ src/misc/iso_lang.c \ src/misc/iso-639_def.h \ src/misc/messages.c \ @@ -371,6 +398,7 @@ SOURCES_libvlc_common = \ src/misc/error.c \ src/misc/net.c \ src/misc/vlm.c \ + src/misc/xml.c \ src/extras/libc.c \ $(NULL) @@ -501,12 +529,14 @@ VLC.app: vlc prefs.h \ prefs.m \ vout.h \ + voutqt.m \ + voutgl.m \ vout.m; do \ cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' - cp -r $(top_builddir)/tmp/extras/MacOSX/build/vlc.bundle \ + cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ $(top_builddir)/VLC.app rm -Rf $(top_builddir)/tmp $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS @@ -589,84 +619,92 @@ remove_distdir_woody = \ # package-win32-base: # Check that tmp isn't in the way - @if test -e "$(srcdir)/vlc-${VERSION}"; then \ - echo "Error: please remove $(srcdir)/vlc-${VERSION}, it is in the way"; \ + @if test -e "$(top_builddir)/vlc-${VERSION}"; then \ + echo "Error: please remove $(top_builddir)/vlc-${VERSION}, it is in the way"; \ false; \ else \ - echo "OK."; mkdir -p "$(srcdir)/vlc-${VERSION}"; \ + echo "OK."; mkdir -p "$(top_builddir)/vlc-${VERSION}"; \ fi # Copy relevant files - cp "$(srcdir)/vlc.win32.nsi" "$(srcdir)/vlc-${VERSION}/" - cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/vlc-${VERSION}/" - cp "$(top_builddir)/vlc.exe.manifest" "$(srcdir)/vlc-${VERSION}/" - $(STRIP) "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)" + cp "$(srcdir)/vlc.win32.nsi" "$(top_builddir)/vlc-${VERSION}/" + cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/" + cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/" + $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)" for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \ - do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; \ - unix2dos "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; done + do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \ + unix2dos "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done - mkdir -p "$(srcdir)/vlc-${VERSION}/plugins" + mkdir -p "$(top_builddir)/vlc-${VERSION}/plugins" for i in "" `$(VLC_CONFIG) --target plugin` ; do \ if test -n "$$i" ; then \ - $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" \ - "$(srcdir)/vlc-${VERSION}/plugins/" ; \ + $(INSTALL) "$(top_builddir)/$$i$(LIBEXT)" \ + "$(top_builddir)/vlc-${VERSION}/plugins/" ; \ fi ; done - for i in "" $(srcdir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \ + for i in "" $(top_builddir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \ do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done - mkdir $(srcdir)/vlc-${VERSION}/locale + mkdir $(top_builddir)/vlc-${VERSION}/locale for i in $(ALL_LINGUAS); do \ - mkdir -p "$(srcdir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \ + mkdir -p "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \ cp "$(srcdir)/po/$${i}.gmo" \ - "$(srcdir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES/vlc.mo" \ + "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES/vlc.mo" \ || true ; \ done - mkdir -p $(srcdir)/vlc-${VERSION}/skins/default - for i in $(srcdir)/share/skins/default/*.*; do \ - cp $$i $(srcdir)/vlc-${VERSION}/skins/default/ || true ; \ - done - for i in $(srcdir)/doc/skins/*.txt; do \ - cp $$i $(srcdir)/vlc-${VERSION}/skins/ || true ; \ - done - mkdir -p $(srcdir)/vlc-${VERSION}/skins2/fonts + mkdir -p $(top_builddir)/vlc-${VERSION}/skins/fonts for i in $(srcdir)/share/skins2/fonts/*.*; do \ - cp $$i $(srcdir)/vlc-${VERSION}/skins2/fonts/ || true ; \ - done - mkdir -p $(srcdir)/vlc-${VERSION}/skins2/default - for i in $(srcdir)/share/skins2/default/*.*; do \ - cp $$i $(srcdir)/vlc-${VERSION}/skins2/default/ || true ; \ + cp $$i $(top_builddir)/vlc-${VERSION}/skins/fonts/ || true ; \ done for i in $(srcdir)/share/skins2/*.*; do \ - cp $$i $(srcdir)/vlc-${VERSION}/skins2/ || true ; \ + cp $$i $(top_builddir)/vlc-${VERSION}/skins/ || true ; \ done - mkdir -p "$(srcdir)/vlc-${VERSION}/http/admin" - mkdir -p "$(srcdir)/vlc-${VERSION}/http/vlm" - cp $(srcdir)/share/http/*.html $(srcdir)/vlc-${VERSION}/http/ ; - cp $(srcdir)/share/http/*.css $(srcdir)/vlc-${VERSION}/http/ ; + mkdir -p "$(top_builddir)/vlc-${VERSION}/http/admin" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http/vlm" + cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ; + cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ; cp $(srcdir)/share/http/admin/*.html \ - $(srcdir)/vlc-${VERSION}/http/admin/ ; + $(top_builddir)/vlc-${VERSION}/http/admin/ ; cp $(srcdir)/share/http/admin/.access \ - $(srcdir)/vlc-${VERSION}/http/admin/ ; + $(top_builddir)/vlc-${VERSION}/http/admin/ ; cp $(srcdir)/share/http/vlm/*.html \ - $(srcdir)/vlc-${VERSION}/http/vlm/ ; + $(top_builddir)/vlc-${VERSION}/http/vlm/ ; - cp $(srcdir)/share/vlc48x48.ico $(srcdir)/vlc-${VERSION}/ ; + cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ; - mkdir -p "$(srcdir)/vlc-${VERSION}/mozilla" + mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla" if BUILD_MOZILLA - cp $(srcdir)/mozilla/*$(LIBEXT) $(srcdir)/vlc-${VERSION}/mozilla/ ; - $(STRIP) $(srcdir)/vlc-${VERSION}/mozilla/*$(LIBEXT); - cp $(srcdir)/mozilla/vlcintf.xpt $(srcdir)/vlc-${VERSION}/mozilla/ ; + cp $(top_builddir)/mozilla/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ; + $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT); + cp $(top_builddir)/mozilla/vlcintf.xpt $(top_builddir)/vlc-${VERSION}/mozilla/ ; +endif + + mkdir -p "$(top_builddir)/vlc-${VERSION}/activex" +if BUILD_ACTIVEX + cp $(top_builddir)/activex/README.TXT $(top_builddir)/vlc-${VERSION}/activex/ ; + cp $(top_builddir)/activex/test.html $(top_builddir)/vlc-${VERSION}/activex/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ; + + cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ; + $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT); endif package-win32-base-exe: -# Create package +# Create package wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe \ - -- /DVERSION=${VERSION} $(srcdir)/vlc-${VERSION}/vlc.win32.nsi + /DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi + +package-win32-base-exe-cygwin: +# Create package + C:/Program\ Files/NSIS/makensis.exe \ + /DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi + +package-win32-base-exe-linux: +# Create package + makensis -DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi package-win32-base-zip: # Create package @@ -674,15 +712,19 @@ package-win32-base-zip: package-win32-exe: package-win32-base package-win32-base-exe # Clean up - rm -Rf $(srcdir)/vlc-${VERSION} + rm -Rf $(top_builddir)/vlc-${VERSION} + +package-win32-exe-linux: package-win32-base package-win32-base-exe-linux +# Clean up + rm -Rf $(top_builddir)/vlc-${VERSION} package-win32-zip: package-win32-base package-win32-base-zip # Clean up - rm -Rf $(srcdir)/vlc-${VERSION} + rm -Rf $(top_builddir)/vlc-${VERSION} package-win32: package-win32-base package-win32-base-exe package-win32-base-zip # Clean up - rm -Rf $(srcdir)/vlc-${VERSION} + rm -Rf $(top_builddir)/vlc-${VERSION} package-beos: # Check that tmp isn't in the way @@ -707,8 +749,8 @@ package-beos: mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc ; # Create normal package - strip --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc ; - find $(srcdir)/tmp/vlc -name 'lib*.so' -exec strip \ + $(STRIP) --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc ; + find $(srcdir)/tmp/vlc -name 'lib*.so' -exec $(STRIP) \ --strip-debug --strip-unneeded "{}" \; ; xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ; find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ; @@ -769,7 +811,7 @@ package-translations: ############################################################################### # Stamp rules ############################################################################### -clean: clean-stamp +clean: clean-stamp clean-recursive clean-stamp: rm -f stamp-builtin