X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=4dd9bece3aa2250e0a0c4829d5efdb0b64a9ef7f;hb=377df083e1149b4c9c545485b458034a7b9bf2ee;hp=454b11fbb223d300a3816944dfe4be76cb686593;hpb=44b413e9228357efc7f86d5a201be069a846931d;p=vlc diff --git a/Makefile.am b/Makefile.am index 454b11fbb2..4dd9bece3a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,13 +21,13 @@ EXTRA_DIST = \ 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 = @@ -68,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 \ @@ -97,22 +94,26 @@ 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_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_vlm.h \ include/vlc_objects.h \ include/vlc_playlist.h \ - include/vlc_threads.h \ + include/vlc_stream.h \ include/vlc_threads_funcs.h \ + include/vlc_threads.h \ include/vlc_video.h \ + include/vlc_vlm.h \ include/vout_synchro.h \ include/win32_specific.h \ - include/osd.h \ $(NULL) HEADERS_include_built = \ @@ -322,21 +323,22 @@ 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/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 \ @@ -403,14 +405,28 @@ 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" +vlc-bundle: vlc + rm -Rf $(srcdir)/vlc-bundle ; mkdir -p $(srcdir)/vlc-bundle + cp $(srcdir)/vlc $(srcdir)/vlc-bundle/ + xres -o $(srcdir)/vlc-bundle/vlc $(srcdir)/share/vlc_beos.rsrc + for i in "" `$(VLC_CONFIG) --target plugin` ; do \ + if test -n "$$i" ; then \ + mkdir -p $(srcdir)/vlc-bundle/plugins ; \ + cp "$$i$(LIBEXT)" $(srcdir)/vlc-bundle/plugins/ ; \ + fi ; \ + done + if test -d $(srcdir)/extras/contrib/vlc-lib ; then \ + mkdir -p $(srcdir)/vlc-bundle/lib ; \ + for i in $(srcdir)/extras/contrib/vlc-lib/*.so ; do \ + cp $$i $(srcdir)/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 "$(srcdir)/vlc-bundle/locale/$$i/LC_MESSAGES" ; \ + cp "$(srcdir)/po/$$i.gmo" \ + "$(srcdir)/vlc-bundle/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \ done + find $(srcdir)/vlc-bundle -type f -exec mimeset -f "{}" \; endif # Install the modules and the symlinks @@ -461,8 +477,6 @@ VLC.app: vlc applescript.m \ controls.h \ controls.m \ - info.h \ - info.m \ intf.h \ intf.m \ macosx.m \ @@ -492,6 +506,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" ; \ @@ -566,19 +581,19 @@ 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)" @if test -n "$(UPX)"; then \ $(UPX) -9 "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)"; fi ; @@ -637,6 +652,8 @@ package-win32-base: 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 cp $(srcdir)/mozilla/*$(LIBEXT) $(srcdir)/vlc-${VERSION}/mozilla/ ; @@ -649,7 +666,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 @@ -678,23 +695,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} ; @@ -718,7 +733,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