X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=897e588d3f54b93a53995d2ffbf87731f316e0fe;hb=338f5aa92bf3491be9326f53c3e8411cbecb7e43;hp=4dd9bece3aa2250e0a0c4829d5efdb0b64a9ef7f;hpb=2088177805fdbf1387ecdf37fa0f6a3d03964aca;p=vlc diff --git a/Makefile.am b/Makefile.am index 4dd9bece3a..897e588d3f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,8 +11,8 @@ 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 -DIST_SUBDIRS = $(SUBDIRS) src debian ipkg lib autotools +SUBDIRS = intl modules po . mozilla activex share m4 doc +DIST_SUBDIRS = $(SUBDIRS) src debian ipkg lib EXTRA_DIST = \ HACKING \ @@ -24,7 +24,6 @@ EXTRA_DIST = \ src/extras/COPYING \ toolbox \ vlc-config.in.in \ - vlc.ebuild \ vlc.spec \ vlc.spec.mdk \ vlc.win32.nsi \ @@ -98,8 +97,11 @@ HEADERS_include = \ include/vlc_error.h \ include/vlc_es.h \ include/vlc_es_out.h \ - include/vlc_help.h \ + include/vlc_filter.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 \ @@ -107,11 +109,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) @@ -120,13 +125,13 @@ HEADERS_include_built = \ include/vlc_symbols.h \ $(NULL) -include/vlc_symbols.h: Makefile $(HEADERS_include) - srcdir=$(srcdir) $(srcdir)/toolbox --update-includes - -src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include) - srcdir=$(srcdir) $(srcdir)/toolbox --update-includes +# Common dependencies for these 3 files : Makefile vlc-config +# Specific dependencies : +# include/vlc_symbols.h: $(HEADERS_include) +# src/misc/modules_plugin.h: src/misc/modules_plugin.h.in $(HEADERS_include) +# src/misc/modules_builtin.h: src/misc/modules_builtin.h.in -src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in +include/vlc_symbols.h src/misc/modules_plugin.h src/misc/modules_builtin.h: Makefile $(HEADERS_include) vlc-config src/misc/modules_plugin.h.in src/misc/modules_builtin.h.in srcdir=$(srcdir) $(srcdir)/toolbox --update-includes # These dependencies are mandatory @@ -152,8 +157,16 @@ 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 \ extras/MacOSX/Resources/aac.icns \ extras/MacOSX/Resources/asf.icns \ @@ -192,6 +205,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 \ @@ -211,6 +226,7 @@ EXTRA_DIST += \ extras/MacOSX/Resources/volumetrack.png \ extras/MacOSX/Resources/about_bg.png \ extras/MacOSX/Resources/vlc.scriptSuite \ + extras/MacOSX/Resources/vlc.scriptTerminology \ extras/MacOSX/Resources/README \ extras/MacOSX/vlc.pbproj/project.pbxproj \ extras/MacOSX/macosx-dmg \ @@ -231,20 +247,27 @@ 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) 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) @@ -268,6 +291,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 @@ -302,7 +328,6 @@ SOURCES_libvlc_win32 = \ SOURCES_libvlc_dirent = \ src/extras/dirent.c \ - src/extras/dirent.h \ $(NULL) SOURCES_libvlc_getopt = \ @@ -319,10 +344,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 \ @@ -332,6 +357,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 \ @@ -354,12 +380,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 \ @@ -368,6 +396,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) @@ -388,7 +417,12 @@ bin_PROGRAMS = vlc vlc_SOURCES = src/vlc.c -vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin` +# Work around a bug in the arm-wince-pe linker +if HAVE_WINCE +vlc_WORKAROUNDLDFLAGS = lib/libvlc.a +endif + +vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin` $(vlc_WORKAROUNDLDFLAGS) vlc_LDADD = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl) vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` @@ -405,28 +439,29 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin esac if HAVE_BEOS +noinst_DATA = vlc-bundle 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 + 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 $(srcdir)/vlc-bundle/plugins ; \ - cp "$$i$(LIBEXT)" $(srcdir)/vlc-bundle/plugins/ ; \ + mkdir -p $(top_builddir)/vlc-bundle/plugins ; \ + cp "$$i$(LIBEXT)" $(top_builddir)/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/ ; \ + 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)/vlc-bundle/locale/$$i/LC_MESSAGES" ; \ - cp "$(srcdir)/po/$$i.gmo" \ - "$(srcdir)/vlc-bundle/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 $(srcdir)/vlc-bundle -type f -exec mimeset -f "{}" \; + find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \; endif # Install the modules and the symlinks @@ -454,6 +489,104 @@ if HAVE_DARWIN # Create the MacOS X app vlc_app_DATA = VLC.app vlc_appdir = $(bindir) +# VLC-release.app is the old VLC.app target +VLC-release.app: vlc + @if test -e "$(top_builddir)/tmp"; then \ + echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \ + false; \ + else \ + echo "OK."; mkdir -p "$(top_builddir)/tmp/extras"; \ + fi + rm -Rf $(top_builddir)/VLC-release.app + cp -r $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras + for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \ + cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ + done + mkdir -p $(top_builddir)/tmp/modules/audio_output + cp $(srcdir)/modules/audio_output/coreaudio.c \ + $(top_builddir)/tmp/modules/audio_output/coreaudio.c + mkdir -p $(top_builddir)/tmp/modules/gui/macosx + for i in \ + about.h \ + about.m \ + applescript.h \ + applescript.m \ + controls.h \ + controls.m \ + equalizer.h \ + equalizer.m \ + intf.h \ + intf.m \ + macosx.m \ + misc.h \ + misc.m \ + open.h \ + open.m \ + output.h \ + 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; \ + done + cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' + cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ + $(top_builddir)/VLC-release.app + rm -Rf $(top_builddir)/tmp + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS + $(INSTALL) $(top_builddir)/vlc \ + $(top_builddir)/VLC-release.app/Contents/MacOS/VLC + ln -sf ./VLC $(top_builddir)/VLC-release.app/Contents/MacOS/clivlc + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/modules + for i in "" `$(VLC_CONFIG) --target plugin` ; do \ + if test -n "$$i" ; \ + then $(INSTALL) "$$i$(LIBEXT)" \ + "$(top_builddir)/VLC-release.app/Contents/MacOS/modules" ; \ + fi ; done + if test -d $(top_builddir)/extras/contrib/vlc-lib; then \ + mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/lib ; \ + for i in $(top_builddir)/extras/contrib/vlc-lib/*.dylib ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/vlc_`basename $${i}` ; \ + done ; \ + fi + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http + for i in $(srcdir)/share/http/* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \ + done ; \ + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/vlm + for i in $(srcdir)/share/http/vlm/* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/vlm/`basename $${i}` ; \ + done ; \ + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/admin + for i in $(srcdir)/share/http/admin/* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/admin/`basename $${i}` ; \ + done ; \ + $(INSTALL) -m 644 $(srcdir)/share/http/admin/.access $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/admin/.access + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/locale + for i in $(ALL_LINGUAS); do \ + mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ + cp $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ + mkdir -p $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ + ln -sf ../English.lproj/InfoPlist.strings \ + $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ + ln -sf ../English.lproj/MainMenu.nib \ + $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ + ln -sf ../English.lproj/vlc.scriptTerminology \ + $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ + done + printf "APPLVLC#" >| $(top_builddir)/VLC-release.app/Contents/PkgInfo + VLC.app: vlc @if test -e "$(top_builddir)/tmp"; then \ echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \ @@ -477,6 +610,8 @@ VLC.app: vlc applescript.m \ controls.h \ controls.m \ + equalizer.h \ + equalizer.m \ intf.h \ intf.m \ macosx.m \ @@ -495,12 +630,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 @@ -510,40 +647,25 @@ VLC.app: vlc $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules for i in "" `$(VLC_CONFIG) --target plugin` ; do \ if test -n "$$i" ; \ - then $(INSTALL) "$$i$(LIBEXT)" \ + then ln -sfn "`pwd`/$$i$(LIBEXT)" \ "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \ fi ; done if test -d $(top_builddir)/extras/contrib/vlc-lib; then \ mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/lib ; \ for i in $(top_builddir)/extras/contrib/vlc-lib/*.dylib ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/lib/vlc_`basename $${i}` ; \ + ln -sfn `pwd`/$${i} $(top_builddir)/VLC.app/Contents/MacOS/lib/vlc_`basename $${i}` ; \ done ; \ fi - $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share - $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http - 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 + ln -sfn `pwd`/share $(top_builddir)/VLC.app/Contents/MacOS/ $(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 ; \ - cp $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ + ln -sfn `pwd`/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ mkdir -p $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \ ln -sf ../English.lproj/InfoPlist.strings \ $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \ ln -sf ../English.lproj/MainMenu.nib \ $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \ - ln -sf ../English.lproj/vlc.scriptTerminology \ - $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \ done printf "APPLVLC#" >| $(top_builddir)/VLC.app/Contents/PkgInfo endif @@ -583,90 +705,103 @@ 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)" - @if test -n "$(UPX)"; then \ - $(UPX) -9 "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)"; fi ; + 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) ; \ - do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; \ - if test -n "$(UPX)" -a -n "$$i"; then $(UPX) -9 "$$i"; fi ; \ - done + 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/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ; + cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ; + cp $(srcdir)/share/http/*.png $(top_builddir)/vlc-${VERSION}/http/ + cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ; cp $(srcdir)/share/http/admin/*.html \ - $(srcdir)/vlc-${VERSION}/http/admin/ ; + $(top_builddir)/vlc-${VERSION}/http/admin/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/admin/*.html ; cp $(srcdir)/share/http/admin/.access \ - $(srcdir)/vlc-${VERSION}/http/admin/ ; + $(top_builddir)/vlc-${VERSION}/http/admin/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/admin/.access ; cp $(srcdir)/share/http/vlm/*.html \ - $(srcdir)/vlc-${VERSION}/http/vlm/ ; + $(top_builddir)/vlc-${VERSION}/http/vlm/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ; - 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); - @if test $(UPX); then \ - $(UPX) -9 $(srcdir)/vlc-${VERSION}/mozilla/npvlc$(LIBEXT); fi ; \ - 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 +# Rebase all those DLLs to speed up loading (need cygwin rebase) + if [ -x rebase ]; then \ + find $(top_builddir)/vlc-${VERSION} -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \ + fi 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 +809,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 +846,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 {} \; ; @@ -729,7 +868,7 @@ package-macosx: fi # Copy relevant files - cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/tmp/" + cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/tmp/VLC.app" cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/ # Create disk image @@ -769,7 +908,7 @@ package-translations: ############################################################################### # Stamp rules ############################################################################### -clean: clean-stamp +clean: clean-stamp clean-recursive clean-stamp: rm -f stamp-builtin