X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=20049570a4e42abb845d9ef5b16b10c833fc71f1;hb=6de833a425913c7f4fc6d0ef1b77dbd13f10526e;hp=f908f861b9c9b9a7929b30f7a3ccce147307004a;hpb=85d67b22292df8cadd29fcbdd8ebd46d0eb53d7c;p=vlc diff --git a/Makefile.am b/Makefile.am index f908f861b9..20049570a4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,21 +12,22 @@ NULL = # - . 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 -DIST_SUBDIRS = $(SUBDIRS) src debian ipkg lib autotools +DIST_SUBDIRS = $(SUBDIRS) src debian ipkg lib EXTRA_DIST = \ HACKING \ INSTALL.win32 \ + vlc.exe.manifest \ MAINTAINERS \ README.MacOSX.rtf \ bootstrap \ - install-win32 \ src/extras/COPYING \ toolbox \ vlc-config.in.in \ vlc.ebuild \ vlc.spec \ vlc.spec.mdk \ + vlc.win32.nsi \ $(NULL) BUILT_SOURCES = @@ -67,28 +68,25 @@ HEADERS_include = \ include/aout_internal.h \ include/audio_output.h \ include/beos_specific.h \ - include/configuration.h \ - include/darwin_specific.h \ include/charset.h \ include/codecs.h \ - include/ninput.h \ - include/input_ext-dec.h \ - include/input_ext-intf.h \ - include/input_ext-plugins.h \ + include/configuration.h \ + include/darwin_specific.h \ include/intf_eject.h \ include/iso_lang.h \ - include/vlc_httpd.h \ include/main.h \ include/mmx.h \ include/modules.h \ include/modules_inner.h \ include/mtime.h \ include/network.h \ + include/osd.h \ include/os_specific.h \ - include/stream_control.h \ + include/snapshot.h \ include/stream_output.h \ include/variables.h \ include/video_output.h \ + include/vlc_access.h \ include/vlc_bits.h \ include/vlc_block.h \ include/vlc_block_helper.h \ @@ -96,21 +94,29 @@ HEADERS_include = \ include/vlc_common.h \ include/vlc_config.h \ include/vlc_cpu.h \ + include/vlc_demux.h \ include/vlc_error.h \ include/vlc_es.h \ + include/vlc_es_out.h \ + include/vlc_filter.h \ include/vlc_help.h \ + include/vlc_httpd.h \ + include/vlc_input.h \ include/vlc_interface.h \ include/vlc_keys.h \ include/vlc_messages.h \ include/vlc_meta.h \ include/vlc_objects.h \ include/vlc_playlist.h \ - include/vlc_threads.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/vout_synchro.h \ include/win32_specific.h \ - include/osd.h \ $(NULL) HEADERS_include_built = \ @@ -189,6 +195,8 @@ EXTRA_DIST += \ extras/MacOSX/Resources/display.png \ extras/MacOSX/Resources/display_slider.png \ extras/MacOSX/Resources/display_track.png \ + extras/MacOSX/Resources/equalizerdrawer_active.png \ + extras/MacOSX/Resources/equalizerdrawer_blue.png \ extras/MacOSX/Resources/fullscreen_active.png \ extras/MacOSX/Resources/fullscreen_blue.png \ extras/MacOSX/Resources/next_active.png \ @@ -229,12 +237,13 @@ EXTRA_DIST += \ evc/vlc.vcp.in \ evc/plugins.vcp.in \ evc/vlc.c \ + evc/errno.h \ evc/config.h.in \ evc/modules_builtin_evc.h \ $(NULL) dist-hook: - mv $(distdir)/vlc.ebuild $(distdir)/vlc-${VERSION}.ebuild + cp $(distdir)/vlc.ebuild $(distdir)/vlc-${VERSION}.ebuild cd $(distdir) && srcdir=$(srcdir) $(srcdir)/toolbox --update-vc ############################################################################### @@ -320,23 +329,25 @@ SOURCES_libvlc_common = \ src/playlist/item.c \ src/playlist/item-ext.c \ src/playlist/info.c \ - src/input/input.c \ + src/input/access.c \ + src/input/clock.c \ + src/input/control.c \ + src/input/decoder.c \ + src/input/demux.c \ src/input/es_out.c \ + src/input/input.c \ + src/input/input_internal.h \ src/input/stream.c \ - src/input/demux.c \ src/input/subtitles.c \ - src/input/input_ext-plugins.c \ - src/input/input_ext-intf.c \ - src/input/input_dec.c \ - src/input/input_programs.c \ - src/input/input_clock.c \ - src/input/input_info.c \ + src/input/var.c \ src/video_output/video_output.c \ src/video_output/vout_pictures.c \ src/video_output/vout_pictures.h \ src/video_output/video_text.c \ + src/video_output/video_widgets.c \ src/video_output/vout_subpictures.c \ src/video_output/vout_synchro.c \ + src/video_output/vout_intf.c \ src/audio_output/common.c \ src/audio_output/dec.c \ src/audio_output/filters.c \ @@ -345,6 +356,8 @@ SOURCES_libvlc_common = \ src/audio_output/output.c \ src/audio_output/intf.c \ src/stream_output/stream_output.c \ + src/stream_output/announce.c \ + src/stream_output/sap.c \ src/misc/charset.c \ src/misc/httpd.c \ src/misc/mtime.c \ @@ -360,6 +373,7 @@ SOURCES_libvlc_common = \ src/misc/variables.c \ src/misc/error.c \ src/misc/net.c \ + src/misc/vlm.c \ src/extras/libc.c \ $(NULL) @@ -397,14 +411,29 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin esac if HAVE_BEOS - xres -o $@ $(srcdir)/share/vlc_beos.rsrc - mimeset -f $@ - rm -Rf $(srcdir)/locale ; mkdir -p "$(srcdir)/locale" +noinst_DATA = vlc-bundle +vlc-bundle: vlc + rm -Rf $(top_builddir)/vlc-bundle ; mkdir -p $(top_builddir)/vlc-bundle + cp $(top_builddir)/vlc $(top_builddir)/vlc-bundle/ + xres -o $(top_builddir)/vlc-bundle/vlc $(srcdir)/share/vlc_beos.rsrc + for i in "" `$(VLC_CONFIG) --target plugin` ; do \ + if test -n "$$i" ; then \ + mkdir -p $(top_builddir)/vlc-bundle/plugins ; \ + cp "$$i$(LIBEXT)" $(top_builddir)/vlc-bundle/plugins/ ; \ + fi ; \ + done + if test -d $(top_builddir)/extras/contrib/vlc-lib ; then \ + mkdir -p $(top_builddir)/vlc-bundle/lib ; \ + for i in $(top_builddir)/extras/contrib/vlc-lib/*.so ; do \ + cp $$i $(top_builddir)/vlc-bundle/lib/ ; \ + done ; \ + fi for i in $(ALL_LINGUAS); do \ - mkdir -p "$(srcdir)/locale/$${i}/LC_MESSAGES" ; \ - cp "$(srcdir)/po/$${i}.gmo" \ - "$(srcdir)/locale/$${i}/LC_MESSAGES/vlc.mo" || true ; \ + mkdir -p "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES" ; \ + cp "$(top_builddir)/po/$$i.gmo" \ + "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \ done + find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \; endif # Install the modules and the symlinks @@ -455,8 +484,8 @@ VLC.app: vlc applescript.m \ controls.h \ controls.m \ - info.h \ - info.m \ + equalizer.h \ + equalizer.m \ intf.h \ intf.m \ macosx.m \ @@ -468,11 +497,15 @@ VLC.app: vlc output.m \ playlist.h \ playlist.m \ + playlistinfo.h \ + playlistinfo.m \ prefs_widgets.h \ prefs_widgets.m \ 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; \ @@ -484,6 +517,7 @@ VLC.app: vlc $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS $(INSTALL) $(top_builddir)/vlc \ $(top_builddir)/VLC.app/Contents/MacOS/VLC + ln -sf ./VLC $(top_builddir)/VLC.app/Contents/MacOS/clivlc $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules for i in "" `$(VLC_CONFIG) --target plugin` ; do \ if test -n "$$i" ; \ @@ -501,10 +535,15 @@ VLC.app: vlc for i in $(srcdir)/share/http/* ; do \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/share/http/`basename $${i}` ; \ done ; \ + $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http/vlm + for i in $(srcdir)/share/http/vlm/* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/share/http/vlm/`basename $${i}` ; \ + done ; \ $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin for i in $(srcdir)/share/http/admin/* ; do \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin/`basename $${i}` ; \ done ; \ + $(INSTALL) -m 644 $(srcdir)/share/http/admin/.access $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin/.access $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale for i in $(ALL_LINGUAS); do \ mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ @@ -553,22 +592,23 @@ remove_distdir_woody = \ # XXX: this rule is probably only useful to you if you have exactly # the same setup as me. Contact sam@zoy.org if you need to use it. # -# Check that tmp isn't in the way 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"; \ false; \ else \ echo "OK."; mkdir -p "$(srcdir)/vlc-${VERSION}"; \ fi -# Create installation script - cp "$(srcdir)/install-win32" "$(srcdir)/vlc-${VERSION}/nsi" + # Copy relevant files + cp "$(srcdir)/vlc.win32.nsi" "$(srcdir)/vlc-${VERSION}/" cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/vlc-${VERSION}/" - cp "$(top_builddir)/vlc$(EXEEXT).manifest" "$(srcdir)/vlc-${VERSION}/" + cp "$(top_builddir)/vlc.exe.manifest" "$(srcdir)/vlc-${VERSION}/" $(STRIP) "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)" + for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \ - do cp "$(srcdir)/$$file" "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; \ + do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; \ unix2dos "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; done mkdir -p "$(srcdir)/vlc-${VERSION}/plugins" @@ -589,25 +629,26 @@ package-win32-base: || 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 ; \ + mkdir -p $(srcdir)/vlc-${VERSION}/skins/fonts + for i in $(srcdir)/share/skins2/fonts/*.*; do \ + cp $$i $(srcdir)/vlc-${VERSION}/skins/fonts/ || true ; \ done - for i in $(srcdir)/doc/skins/*.txt; do \ + for i in $(srcdir)/share/skins2/*.*; do \ cp $$i $(srcdir)/vlc-${VERSION}/skins/ || true ; \ done - mkdir -p $(srcdir)/vlc-${VERSION}/skins2/default - for i in $(srcdir)/modules/gui/skins2/theme/*.*; do \ - cp $$i $(srcdir)/vlc-${VERSION}/skins2/default/ || 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/ ; cp $(srcdir)/share/http/admin/*.html \ $(srcdir)/vlc-${VERSION}/http/admin/ ; cp $(srcdir)/share/http/admin/.access \ $(srcdir)/vlc-${VERSION}/http/admin/ ; + cp $(srcdir)/share/http/vlm/*.html \ + $(srcdir)/vlc-${VERSION}/http/vlm/ ; + + cp $(srcdir)/share/vlc48x48.ico $(srcdir)/vlc-${VERSION}/ ; mkdir -p "$(srcdir)/vlc-${VERSION}/mozilla" if BUILD_MOZILLA @@ -619,7 +660,7 @@ endif package-win32-base-exe: # Create package wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe \ - -- /DVERSION=${VERSION} $(srcdir)/vlc-${VERSION}/nsi + /DVERSION=${VERSION} $(srcdir)/vlc-${VERSION}/vlc.win32.nsi package-win32-base-zip: # Create package @@ -648,23 +689,21 @@ package-beos: # Copy relevant files mkdir -p $(srcdir)/tmp/vlc ; - cd $(srcdir) && \ - cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/ ; -# We cannot use ${PLUGIN_FILES} as it looks like it is too "long" for the BeOS shell... - if [ `find $(srcdir)/modules -name "lib*_plugin.so" | wc -l` -gt 0 ]; then \ - mkdir -p $(srcdir)/tmp/vlc/plugins ; \ - find $(srcdir)/modules -name "lib*_plugin.so" -exec cp {} $(srcdir)/tmp/vlc/plugins/ \; ; \ - fi - for i in $(ALL_LINGUAS); do \ - mkdir -p $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES ; \ - cp $(srcdir)/po/$${i}.gmo $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ - done + cd $(srcdir) && cp -R vlc-bundle/* AUTHORS COPYING ChangeLog README \ + THANKS NEWS tmp/vlc/ ; + +# Create debug package + xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ; + find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ; + mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ; + (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} ) + mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/ ; + mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc ; -# Strip files and create package +# Create normal package strip --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc ; - if [ -d $(srcdir)/tmp/vlc/plugins ]; then \ - strip --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/plugins/lib*_plugin.so ; \ - fi + 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 {} \; ; mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ; @@ -688,7 +727,7 @@ package-macosx: cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/ # Create disk image - $(srcdir)/extras/MacOSX/macosx-dmg 25 "vlc-${VERSION}" $(top_builddir)/tmp/* + $(srcdir)/extras/MacOSX/macosx-dmg "vlc-${VERSION}" $(top_builddir)/tmp # Clean up rm -Rf $(top_builddir)/tmp