X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=008954337743673157e1e63f706c9f50672cb888;hb=875cd3dde62952d9fd9f3ec684a87fd5ea0732c6;hp=b7f9681ed8b2462b2d67de0b950acb85fe20da48;hpb=78a0673f05bd5560eb57f5146ca7971efd9a7ca8;p=vlc diff --git a/Makefile.am b/Makefile.am index b7f9681ed8..0089543377 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,7 +54,10 @@ BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean) SUFFIXES = -DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \ +DISTCHECK_CONFIGURE_FLAGS = \ + --enable-fast-install \ + --disable-dbus \ + --disable-dvd --disable-mad --disable-libmpeg2 \ --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 \ --disable-fribidi --disable-glx @@ -69,6 +72,7 @@ AUTOMAKE_OPTIONS = \ ChangeLog: Makefile.am rm -f -- "$@" + cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs ln -sf doc/ChangeLog-2008 "$@" ############################################################################### @@ -100,9 +104,6 @@ EXTRA_DIST += \ extras/package/macosx/Resources/English.lproj/Extended.nib/classes.nib \ extras/package/macosx/Resources/English.lproj/Extended.nib/info.nib \ extras/package/macosx/Resources/English.lproj/Extended.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/SFilters.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/SFilters.nib/info.nib \ - extras/package/macosx/Resources/English.lproj/SFilters.nib/keyedobjects.nib \ extras/package/macosx/Resources/English.lproj/Update.nib/classes.nib \ extras/package/macosx/Resources/English.lproj/Update.nib/info.nib \ extras/package/macosx/Resources/English.lproj/Update.nib/keyedobjects.nib \ @@ -112,7 +113,7 @@ EXTRA_DIST += \ extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib \ extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/info.nib \ extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/InfoPlist.strings \ + extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \ extras/package/macosx/Resources/a52.icns \ extras/package/macosx/Resources/aac.icns \ extras/package/macosx/Resources/asf.icns \ @@ -254,18 +255,19 @@ EXTRA_DIST += \ extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.icns \ extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.rsrc \ extras/package/macosx/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt \ - extras/package/macosx/plugin/Info.plist \ - extras/package/macosx/plugin/InstallerInfo.plist \ + extras/package/macosx/plugin/Info.plist.in \ + extras/package/macosx/plugin/InstallerInfo.plist.in \ extras/package/macosx/plugin/InstallerDescription.plist \ extras/package/macosx/plugin/pbdevelopment.plist \ - extras/package/macosx/plugin/English.lproj/InfoPlist.strings \ + extras/package/macosx/plugin/English.lproj/InfoPlist.strings.in \ extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \ extras/package/macosx/eyetvplugin/Info.plist \ extras/package/macosx/eyetvplugin/eyetvplugin.c \ extras/package/macosx/eyetvplugin/eyetvplugin.h \ extras/package/macosx/eyetvplugin/English.lproj/InfoPlist.strings \ extras/package/macosx/eyetvplugin/eyetvplugin.xcodeproj/project.pbxproj \ - extras/package/macosx/README.MacOSX.rtf + extras/package/macosx/README.MacOSX.rtf \ + extras/package/macosx/Info.plist.in ############################################################################### @@ -335,9 +337,9 @@ vlc-bundle: vlc done ; \ fi cat $(top_srcdir)/po/LINGUAS | while read i; do \ - mkdir -p "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES" ; \ + mkdir -p "$(top_builddir)/vlc-bundle/share/locale/$$i/LC_MESSAGES" ; \ cp "$(top_builddir)/po/$$i.gmo" \ - "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \ + "$(top_builddir)/vlc-bundle/share/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \ done find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \; endif @@ -348,7 +350,7 @@ endif ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc bin_SCRIPTS = $(ALIASES) -CLEANFILES += $(ALIASES) +CLEANFILES += $(ALIASES) $(noinst_SCRIPTS) EXTRA_SCRIPTS = $(ALL_ALIASES) dist_noinst_SCRIPTS += make-alias @@ -398,9 +400,12 @@ VLC-release.app: vlc rm -Rf "$(top_builddir)/tmp" mkdir -p "$(top_builddir)/tmp/extras/package/macosx" rm -Rf $(top_builddir)/VLC-release.app - for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \ + for i in vlc.xcodeproj Resources README.MacOSX.rtf ; do \ cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ done + for i in Resources Info.plist; do \ + cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ + done for i in AUTHORS COPYING THANKS; do \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ done @@ -445,8 +450,6 @@ VLC-release.app: vlc extended.m \ bookmarks.h \ bookmarks.m \ - sfilters.h \ - sfilters.m \ update.h \ update.m \ interaction.h \ @@ -537,9 +540,9 @@ VLC-release.app: vlc $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/`basename $${i}` ; \ done $(INSTALL) -m 644 $(srcdir)/share/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/readme.txt - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/locale + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale cat $(top_srcdir)/po/LINGUAS | while read i; do \ - mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ + mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/share/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 \ @@ -561,6 +564,9 @@ VLC.app: vlc for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \ cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ done + for i in Resources Info.plist; do \ + cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ + done for i in AUTHORS COPYING THANKS; do \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ done @@ -605,8 +611,6 @@ VLC.app: vlc extended.m \ bookmarks.h \ bookmarks.m \ - sfilters.h \ - sfilters.m \ update.h \ update.m \ interaction.h \ @@ -635,10 +639,10 @@ VLC.app: vlc "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \ fi ; done && \ ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/ - $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale + $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/locale cat $(top_srcdir)/po/LINGUAS | while read i; do \ - mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ - ln -sfn `pwd`/$(srcdir)/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ + mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \ + ln -sfn `pwd`/$(srcdir)/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/share/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 ; \ @@ -655,219 +659,242 @@ VLC.app: vlc # the same setup as the maintaner(s). # +win32_destdir=$(top_builddir)/vlc-$(VERSION) +win32_lua_destdir=$(win32_destdir)/lua +win32_http_destdir=$(win32_destdir)/http + +#Win-common if for win32 and wince package-win-common: # Check that tmp isn't in the way - @if test -e "$(top_builddir)/vlc-$(VERSION)"; then \ - echo "Error: please remove $(top_builddir)/vlc-$(VERSION), it is in the way"; \ + @if test -e "$(win32_destdir)"; then \ + echo "Error: please remove $(win32_destdir), it is in the way"; \ false; \ else \ - echo "OK."; mkdir -p "$(top_builddir)/vlc-$(VERSION)"; \ + echo "OK."; mkdir -p "$(win32_destdir)"; \ fi # Copy relevant files - cp "$(top_builddir)/src/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-$(VERSION)/" - cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(top_builddir)/vlc-$(VERSION)/" - cp "$(top_builddir)/src/.libs/libvlccore$(LIBEXT)" "vlc-$(VERSION)/" - cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-$(VERSION)/" +# Copy executables and libs + cp "$(top_builddir)/src/.libs/vlc$(EXEEXT)" "$(win32_destdir)/" + cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(win32_destdir)/" + cp "$(top_builddir)/src/.libs/libvlccore$(LIBEXT)" "$(win32_destdir)/" + cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "$(win32_destdir)/" +# Copy Text files for file in AUTHORS MAINTAINERS THANKS ; \ - do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-$(VERSION)/$${file}.txt" ; done; + do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(win32_destdir)/$${file}.txt" ; done; for file in NEWS COPYING README; \ - do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-$(VERSION)/$${file}.txt"; done - unix2dos "$(top_builddir)/vlc-$(VERSION)/"*.txt + do cp "$(srcdir)/$$file" "$(win32_destdir)/$${file}.txt"; done + unix2dos "$(win32_destdir)/"*.txt + +# Necessary icons + cp $(srcdir)/share/vlc48x48.ico $(win32_destdir)/ - mkdir -p $(top_builddir)/vlc-$(VERSION)/share/locale +# Copy the locales + mkdir -p $(win32_destdir)/locale cat $(top_srcdir)/po/LINGUAS | while read i; do \ - mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/locale/$${i}/LC_MESSAGES" ; \ + mkdir -p "$(win32_destdir)/locale/$${i}/LC_MESSAGES" ; \ cp "$(srcdir)/po/$${i}.gmo" \ - "$(top_builddir)/vlc-$(VERSION)/share/locale/$${i}/LC_MESSAGES/vlc.mo" \ + "$(win32_destdir)/locale/$${i}/LC_MESSAGES/vlc.mo" \ || true ; \ done + mkdir -p $(win32_destdir)/locale/qt4/ + cp $(QT4LOCALEDIR)/*.qm $(win32_destdir)/locale/qt4/ || true -if BUILD_LUA - mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/lua/http/images" - mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/lua/http/requests" - mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/lua/http/js" - mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/lua/http/dialogs" - cp $(srcdir)/share/lua/http/*.html $(top_builddir)/vlc-$(VERSION)/share/lua/http/ - unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/*.html - cp $(srcdir)/share/lua/http/.hosts $(top_builddir)/vlc-$(VERSION)/share/lua/http/ - unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/.hosts - cp $(srcdir)/share/lua/http/*.css $(top_builddir)/vlc-$(VERSION)/share/lua/http/ - unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/*.css - cp $(srcdir)/share/lua/http/js/*.js $(top_builddir)/vlc-$(VERSION)/share/lua/http/js/ - unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/js/*.js - cp $(srcdir)/share/lua/http/dialogs/* $(top_builddir)/vlc-$(VERSION)/share/lua/http/dialogs/ - unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/dialogs/* - cp $(srcdir)/share/lua/http/dialogs/.hosts $(top_builddir)/vlc-$(VERSION)/share/lua/http/dialogs/ - unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/dialogs/.hosts - cp $(srcdir)/share/lua/http/*.ico $(top_builddir)/vlc-$(VERSION)/share/lua/http/ - cp $(srcdir)/share/lua/http/images/*.png $(top_builddir)/vlc-$(VERSION)/share/lua/http/images/ - cp $(srcdir)/share/lua/http/requests/*.xml $(top_builddir)/vlc-$(VERSION)/share/lua/http/requests/ - unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/requests/*.xml - cp $(srcdir)/share/lua/http/requests/readme $(top_builddir)/vlc-$(VERSION)/share/lua/http/requests/readme.txt - unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/requests/readme.txt -endif - -if BUILD_HTTPD - mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/http/images" - mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/http/requests" - mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/http/js" - mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/http/dialogs" - mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/http/old" - mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/http/old/vlm" - mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/http/old/admin" - cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-$(VERSION)/share/http/ - unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/*.html - cp $(srcdir)/share/http/.hosts $(top_builddir)/vlc-$(VERSION)/share/http/ - unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/.hosts - cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-$(VERSION)/share/http/ - unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/*.css - cp $(srcdir)/share/http/js/*.js $(top_builddir)/vlc-$(VERSION)/share/http/js/ - unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/js/*.js - cp $(srcdir)/share/http/dialogs/* $(top_builddir)/vlc-$(VERSION)/share/http/dialogs/ - unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/dialogs/* - cp $(srcdir)/share/http/dialogs/.hosts $(top_builddir)/vlc-$(VERSION)/share/http/dialogs/ - unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/dialogs/.hosts - cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-$(VERSION)/share/http/ - cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-$(VERSION)/share/http/images/ - cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-$(VERSION)/share/http/requests/ - unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/requests/*.xml - cp $(srcdir)/share/http/requests/readme $(top_builddir)/vlc-$(VERSION)/share/http/requests/readme.txt - unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/requests/readme.txt - - cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-$(VERSION)/share/http/old/ - unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/old/*.html - cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-$(VERSION)/share/http/old/ - cp $(srcdir)/share/http/old/.hosts $(top_builddir)/vlc-$(VERSION)/share/http/old/ - cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-$(VERSION)/share/http/old/ - cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-$(VERSION)/share/http/old/vlm/ - unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/old/vlm/*.html - cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-$(VERSION)/share/http/old/admin/ - unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/old/admin/*.html - cp $(srcdir)/share/http/old/admin/.access $(top_builddir)/vlc-$(VERSION)/share/http/old/admin/ -endif - - cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-$(VERSION)/ - +# Mozilla plugin if BUILD_MOZILLA - mkdir -p "$(top_builddir)/vlc-$(VERSION)/mozilla" - cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/mozilla/ + mkdir -p "$(win32_destdir)/mozilla" + cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(win32_destdir)/mozilla/ endif +# ActiveX plugin if BUILD_ACTIVEX - mkdir -p "$(top_builddir)/vlc-$(VERSION)/activex" - cp $(srcdir)/projects/activex/README.TXT $(top_builddir)/vlc-$(VERSION)/activex/ - cp $(srcdir)/projects/activex/test.html $(top_builddir)/vlc-$(VERSION)/activex/ - unix2dos $(top_builddir)/vlc-$(VERSION)/activex/* + mkdir -p "$(win32_destdir)/activex" + cp $(srcdir)/projects/activex/README.TXT $(win32_destdir)/activex/ + cp $(srcdir)/projects/activex/test.html $(win32_destdir)/activex/ + unix2dos $(win32_destdir)/activex/* - cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/activex/ + cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(win32_destdir)/activex/ endif + # Rebase all those DLLs to speed up loading (need cygwin rebase) if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \ - find $(top_builddir)/vlc-$(VERSION) -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \ + find $(win32_destdir) -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \ fi -package-win-common-strip: - $(STRIP) "$(top_builddir)/vlc-$(VERSION)/vlc$(EXEEXT)" - $(STRIP) "vlc-$(VERSION)/libvlccore$(LIBEXT)" - $(STRIP) "vlc-$(VERSION)/libvlc$(LIBEXT)" -if BUILD_MOZILLA - $(STRIP) $(top_builddir)/vlc-$(VERSION)/mozilla/npvlc$(LIBEXT); -endif -if BUILD_ACTIVEX - $(STRIP) $(top_builddir)/vlc-$(VERSION)/activex/axvlc$(LIBEXT); -endif - package-win32-base-debug: package-win-common # Copy relevant files # Script installer - cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(top_builddir)/vlc-$(VERSION)/" + cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(win32_destdir)/" # Plugins - mkdir -p "$(top_builddir)/vlc-$(VERSION)/plugins" + mkdir -p "$(win32_destdir)/plugins" find modules/ -name '*_plugin$(LIBEXT)' | while read i; do \ if test -n "$$i" ; then \ $(INSTALL) "$$i" "vlc-$(VERSION)/plugins/" ; \ fi ; done -if BUILD_SKINS -# Skins - mkdir -p $(top_builddir)/vlc-$(VERSION)/skins/fonts - for i in $(srcdir)/share/skins2/fonts/*.*; do \ - cp -- "$$i" $(top_builddir)/vlc-$(VERSION)/share/skins/fonts/ || true ; \ - done - for i in $(srcdir)/share/skins2/*.*; do \ - cp -- "$$i" $(top_builddir)/vlc-$(VERSION)/share/skins/ || true ; \ - done +# Copy the lua scripts (HTTP) +if BUILD_LUA + mkdir -p "$(win32_lua_destdir)/http/images" + mkdir -p "$(win32_lua_destdir)/http/requests" + mkdir -p "$(win32_lua_destdir)/http/js" + mkdir -p "$(win32_lua_destdir)/http/dialogs" + cp $(srcdir)/share/lua/http/*.html $(win32_lua_destdir)/http/ + unix2dos $(win32_lua_destdir)/http/*.html + cp $(srcdir)/share/lua/http/.hosts $(win32_lua_destdir)/http/ + unix2dos $(win32_lua_destdir)/http/.hosts + cp $(srcdir)/share/lua/http/*.css $(win32_lua_destdir)/http/ + unix2dos $(win32_lua_destdir)/http/*.css + cp $(srcdir)/share/lua/http/js/*.js $(win32_lua_destdir)/http/js/ + unix2dos $(win32_lua_destdir)/http/js/*.js + cp $(srcdir)/share/lua/http/dialogs/* $(win32_lua_destdir)/http/dialogs/ + unix2dos $(win32_lua_destdir)/http/dialogs/* + cp $(srcdir)/share/lua/http/dialogs/.hosts $(win32_lua_destdir)/http/dialogs/ + unix2dos $(win32_lua_destdir)/http/dialogs/.hosts + cp $(srcdir)/share/lua/http/*.ico $(win32_lua_destdir)/http/ + cp $(srcdir)/share/lua/http/images/*.png $(win32_lua_destdir)/http/images/ + cp $(srcdir)/share/lua/http/requests/*.xml $(win32_lua_destdir)/http/requests/ + unix2dos $(win32_lua_destdir)/http/requests/*.xml + cp $(srcdir)/share/lua/http/requests/readme $(win32_lua_destdir)/http/requests/readme.txt + unix2dos $(win32_lua_destdir)/http/requests/readme.txt endif if BUILD_LUA #Lua Scripts - $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/playlist + $(INSTALL) -d $(win32_lua_destdir)/playlist for i in $(srcdir)/share/lua/playlist/*.* ; do \ - $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/playlist/`basename $${i}` ; \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \ done - $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/meta + $(INSTALL) -d $(win32_lua_destdir)/meta for i in $(srcdir)/share/lua/meta/*.* ; do \ - $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/meta/`basename $${i}` ; \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/`basename $${i}` ; \ done - $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf + $(INSTALL) -d $(win32_lua_destdir)/intf for i in $(srcdir)/share/lua/intf/*.* ; do \ - $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/intf/`basename $${i}` ; \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/intf/`basename $${i}` ; \ done - $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules + $(INSTALL) -d $(win32_lua_destdir)/intf/modules for i in $(srcdir)/share/lua/intf/modules/*.* ; do \ - $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules/`basename $${i}` ; \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/intf/modules/`basename $${i}` ; \ + done +endif + +# Copy the http files +if BUILD_HTTPD + mkdir -p "$(win32_http_destdir)/images" + mkdir -p "$(win32_http_destdir)/requests" + mkdir -p "$(win32_http_destdir)/js" + mkdir -p "$(win32_http_destdir)/dialogs" + mkdir -p "$(win32_http_destdir)/old" + mkdir -p "$(win32_http_destdir)/old/vlm" + mkdir -p "$(win32_http_destdir)/old/admin" + cp $(srcdir)/share/http/*.html $(win32_http_destdir)/ + unix2dos $(win32_http_destdir)/*.html + cp $(srcdir)/share/http/.hosts $(win32_http_destdir)/ + unix2dos $(win32_http_destdir)/.hosts + cp $(srcdir)/share/http/*.css $(win32_http_destdir)/ + unix2dos $(win32_http_destdir)/*.css + cp $(srcdir)/share/http/js/*.js $(win32_http_destdir)/js/ + unix2dos $(win32_http_destdir)/js/*.js + cp $(srcdir)/share/http/dialogs/* $(win32_http_destdir)/dialogs/ + unix2dos $(win32_http_destdir)/dialogs/* + cp $(srcdir)/share/http/dialogs/.hosts $(win32_http_destdir)/dialogs/ + unix2dos $(win32_http_destdir)/dialogs/.hosts + cp $(srcdir)/share/http/*.ico $(win32_http_destdir)/ + cp $(srcdir)/share/http/images/*.png $(win32_http_destdir)/images/ + cp $(srcdir)/share/http/requests/*.xml $(win32_http_destdir)/requests/ + unix2dos $(win32_http_destdir)/requests/*.xml + cp $(srcdir)/share/http/requests/readme $(win32_http_destdir)/requests/readme.txt + unix2dos $(win32_http_destdir)/requests/readme.txt + + cp $(srcdir)/share/http/old/*.html $(win32_http_destdir)/old/ + unix2dos $(win32_http_destdir)/old/*.html + cp $(srcdir)/share/http/old/*.css $(win32_http_destdir)/old/ + cp $(srcdir)/share/http/old/.hosts $(win32_http_destdir)/old/ + cp $(srcdir)/share/http/old/*.png $(win32_http_destdir)/old/ + cp $(srcdir)/share/http/old/vlm/*.html $(win32_http_destdir)/old/vlm/ + unix2dos $(win32_http_destdir)/old/vlm/*.html + cp $(srcdir)/share/http/old/admin/*.html $(win32_http_destdir)/old/admin/ + unix2dos $(win32_http_destdir)/old/admin/*.html + cp $(srcdir)/share/http/old/admin/.access $(win32_http_destdir)/old/admin/ +endif + +if BUILD_SKINS +# Skins + mkdir -p $(win32_destdir)/skins/fonts + for i in $(srcdir)/share/skins2/fonts/*.*; do \ + cp -- "$$i" $(win32_destdir)/skins/fonts/ || true ; \ + done + for i in $(srcdir)/share/skins2/*.*; do \ + cp -- "$$i" $(win32_destdir)/skins/ || true ; \ done endif if BUILD_OSDMENU #OSD Menu - mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/osdmenu" - cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-$(VERSION)/share/osdmenu" + mkdir -p "$(win32_destdir)/osdmenu" + cp $(srcdir)/share/osdmenu/*.* "$(win32_destdir)/osdmenu" for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume minimal;do \ - mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/osdmenu/$$dir"; \ - for file in $(srcdir)/share/osdmenu/$${dir}/* ;do \ - cp -- "$$file" "$(top_builddir)/vlc-$(VERSION)/share/osdmenu/$$dir"; \ + mkdir -p "$(win32_destdir)/osdmenu/$$dir"; \ + for file in $(srcdir)/share/osdmenu/$${dir}/*.png ;do \ + cp -- "$$file" "$(win32_destdir)/osdmenu/$$dir"; \ done; \ done - unix2dos $(top_builddir)/vlc-$(VERSION)/share/osdmenu/*.cfg; - for file in $(top_builddir)/vlc-$(VERSION)/share/osdmenu/*.cfg; do \ + unix2dos $(win32_destdir)/osdmenu/*.cfg; + for file in $(win32_destdir)/osdmenu/*.cfg; do \ sed 's%share/osdmenu%osdmenu%g' "$$file" > "$$file.tmp" || exit $$? ; \ sed 's%/%\\%g' "$$file.tmp" > "$$file" || exit$$? ; \ rm -f -- "$$file.tmp"; \ done endif -package-win32-base: package-win32-base-debug package-win-common-strip - for i in "" $(top_builddir)/vlc-$(VERSION)/plugins/*$(LIBEXT) ; \ +# SDK + mkdir -p "$(win32_destdir)/sdk.tmp" + mkdir -p "$(win32_destdir)/sdk" + d=$$(pwd) && \ + cd src && \ + make install DESTDIR="$$d/vlc-$(VERSION)/sdk.tmp" + cd vlc-$(VERSION) && mv sdk.tmp/$(prefix)/* sdk/ + find vlc-$(VERSION)/sdk.tmp -type d | sort -r | xargs rmdir + rm -Rf vlc-$(VERSION)/sdk/bin + +#strip exe and main dll +package-win-common-strip: package-win32-base-debug + $(STRIP) "vlc-$(VERSION)/vlc$(EXEEXT)" + $(STRIP) "vlc-$(VERSION)/libvlccore$(LIBEXT)" + $(STRIP) "vlc-$(VERSION)/libvlc$(LIBEXT)" +if BUILD_MOZILLA + $(STRIP) "vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)" +endif +if BUILD_ACTIVEX + $(STRIP) "vlc-$(VERSION)/activex/axvlc$(LIBEXT)" +endif + +#strip all plugins dll +package-win32-base: package-win-common-strip + for i in "" $(win32_destdir)/plugins/*$(LIBEXT) ; \ do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done package-win32-base-exe: package-win32-base # Create package + rm -Rf $(win32_destdir)/sdk if makensis -VERSION >/dev/null 2>&1; then \ - MAKENSIS="makensis -DVERSION=$(VERSION)"; \ + MAKENSIS="makensis"; \ elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \ - MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis /DVERSION=$(VERSION)"; \ + MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis"; \ elif [ -x "$(PROGRAMFILES)/NSIS/makensis" ]; then \ - MAKENSIS="$(PROGRAMFILES)/NSIS/makensis -DVERSION=$(VERSION)"; \ + MAKENSIS="$(PROGRAMFILES)/NSIS/makensis"; \ elif wine --version >/dev/null 2>&1; then \ - MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe /DVERSION=$(VERSION)"; \ + MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe"; \ else \ echo 'Error: cannot locate makensis tool'; exit 1; \ fi; \ - eval "$$MAKENSIS $(top_builddir)/vlc-$(VERSION)/vlc.win32.nsi" - -package-win32-base-exe-cygwin: package-win32-base-exe -# Create package - -package-win32-base-exe-linux: -# Create package - makensis -DVERSION=$(VERSION) $(top_builddir)/vlc-$(VERSION)/vlc.win32.nsi + eval "$$MAKENSIS $(win32_destdir)/vlc.win32.nsi" package-win32-base-zip: package-win32-base # Create package + rm -f -- vlc-$(VERSION)-win32.zip zip -r -9 vlc-$(VERSION)-win32.zip vlc-$(VERSION) package-win32-base-7zip: package-win32-base @@ -876,25 +903,21 @@ package-win32-base-7zip: package-win32-base package-win32-exe: package-win32-base package-win32-base-exe # Clean up - 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) + rm -Rf $(win32_destdir) package-win32-zip: package-win32-base-zip # Clean up - rm -Rf $(top_builddir)/vlc-$(VERSION) + rm -Rf $(win32_destdir) package-win32-7zip: package-win32-base-7zip # Clean up - rm -Rf $(top_builddir)/vlc-$(VERSION) + rm -Rf $(win32_destdir) -package-win32-no-clean: package-win32-base-exe package-win32-base-zip package-win32-base-7zip +package-win32-no-clean: package-win32-base-zip package-win32-base-7zip package-win32-base-exe package-win32: package-win32-no-clean # Clean up - rm -Rf $(top_builddir)/vlc-$(VERSION) + rm -Rf $(win32_destdir) package-wince-base: package-win-common package-win-common-strip @@ -904,7 +927,7 @@ package-wince-base-zip: package-wince: package-wince-base package-wince-base-zip # Clean up - rm -Rf $(top_builddir)/vlc-$(VERSION) + rm -Rf $(win32_destdir) package-beos: @@ -1114,6 +1137,9 @@ update-po: | grep -vE 'qt4/ui/.*.h' \ | grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \ | grep -v 'gui/opie' \ + | grep -v 'wxwidgets' \ + | grep -v 'mux/rtp/' \ + | grep -v 'demux/rtpxiph.c' \ | sort ; \ } > $(top_srcdir)/po/POTFILES.in rm -f $(top_srcdir)/po/vlc.pot