X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=cbbeaa79c2ecb3a03b526df766626e1127756ee1;hb=bba2eae5891e8727f09ec422ceb2103fc29b51c9;hp=f85fea65fce9fc8c4cd721911034f3dcf553849d;hpb=4a25a7f26f9b44680c12332a675d71cb7a642ebc;p=vlc diff --git a/Makefile.am b/Makefile.am index f85fea65fc..cbbeaa79c2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,12 +5,11 @@ # SUBDIRS stores the directories where a "make" is required when building # something. DIST_SUBDIRS stores the directories where nothing is built but # which have makefiles with distribution information. -# - src (libvlc) is nedeed by modules, mozilla and bindings +# - src (libvlc) is nedeed by modules # - libs/* are needed by modules BASE_SUBDIRS = po compat src bin modules share doc test -EXTRA_SUBDIRS = m4 extras/package/ipkg \ - libs/loader libs/srtp libs/unzip \ - projects/mozilla projects/activex +EXTRA_SUBDIRS = m4 \ + libs/loader libs/srtp libs/unzip DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS) SUBDIRS = po compat src @@ -29,17 +28,10 @@ if BUILD_VLC SUBDIRS += bin endif SUBDIRS += modules share doc test -if BUILD_MOZILLA -SUBDIRS += projects/mozilla -endif -if BUILD_ACTIVEX -SUBDIRS += projects/activex -endif EXTRA_DIST = \ HACKING \ INSTALL.win32 \ - INSTALL.wince \ extras/package/win32/vlc.exe.manifest \ extras/package/win32/libvlc.dll.manifest \ extras/package/macosx/README.MacOSX.rtf \ @@ -75,10 +67,14 @@ EXTRA_DIST = \ extras/package/win32/languages/sorani.nsh \ extras/package/win32/languages/spanish.nsh -dist_noinst_SCRIPTS = bootstrap toolbox +dist_noinst_SCRIPTS = bootstrap nodist_noinst_SCRIPTS = compile -BUILT_SOURCES_distclean = vlc-config extras/package/win32/vlc.win32.nsi extras/package/win32/spad.nsi +BUILT_SOURCES_distclean = vlc-config +if HAVE_WIN32 +BUILT_SOURCES_distclean += \ + extras/package/win32/vlc.win32.nsi extras/package/win32/spad.nsi +endif if HAVE_DARWIN BUILT_SOURCES_clean = macosx-sdk else @@ -99,21 +95,22 @@ DISTCHECK_CONFIGURE_FLAGS = \ --disable-faad --disable-skins2 \ --disable-live555 \ --disable-fribidi --disable-glx \ + --disable-mkv \ --with-kde-solid='$${datadir}/kde4/apps' ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = \ - 1.9 \ + 1.11 \ -Wall \ check-news \ - dist-bzip2 \ + dist-xz \ no-dist-gzip # std-options ChangeLog: Makefile.am rm -f -- "$@" cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs - ln -sf doc/ChangeLog-2009 "$@" + $(LN_S) -f doc/ChangeLog-2009 "$@" ############################################################################### # MacOS X project @@ -164,33 +161,22 @@ EXTRA_DIST += \ extras/package/macosx/Resources/wma.icns \ extras/package/macosx/Resources/wmv.icns \ extras/package/macosx/Resources/pause.png \ - extras/package/macosx/Resources/pause_blue.png \ extras/package/macosx/Resources/play.png \ - extras/package/macosx/Resources/play_blue.png \ extras/package/macosx/Resources/stop.png \ - extras/package/macosx/Resources/stop_blue.png \ extras/package/macosx/Resources/display_left.png \ extras/package/macosx/Resources/display_middle.png \ extras/package/macosx/Resources/display_right.png \ extras/package/macosx/Resources/display_slider.png \ extras/package/macosx/Resources/display_track.png \ extras/package/macosx/Resources/equalizerdrawer_active.png \ - extras/package/macosx/Resources/equalizerdrawer_blue.png \ extras/package/macosx/Resources/fullscreen_active.png \ - extras/package/macosx/Resources/fullscreen_blue.png \ extras/package/macosx/Resources/next_active.png \ - extras/package/macosx/Resources/next_blue.png \ extras/package/macosx/Resources/playlistdrawer_active.png \ - extras/package/macosx/Resources/playlistdrawer_blue.png \ extras/package/macosx/Resources/previous_active.png \ - extras/package/macosx/Resources/previous_blue.png \ extras/package/macosx/Resources/skip_forward_active.png \ - extras/package/macosx/Resources/skip_forward_blue.png \ extras/package/macosx/Resources/skip_previous_active.png \ - extras/package/macosx/Resources/skip_previous_blue.png \ extras/package/macosx/Resources/volume_high.png \ extras/package/macosx/Resources/volume_low.png \ - extras/package/macosx/Resources/volumeslider_blue.png \ extras/package/macosx/Resources/volumeslider_normal.png \ extras/package/macosx/Resources/volumetrack.png \ extras/package/macosx/Resources/about_bg.png \ @@ -198,20 +184,12 @@ EXTRA_DIST += \ extras/package/macosx/Resources/play_embedded.png \ extras/package/macosx/Resources/pause_embedded.png \ extras/package/macosx/Resources/skip_previous_active_embedded.png \ - extras/package/macosx/Resources/pause_embedded_blue.png \ - extras/package/macosx/Resources/play_embedded_blue.png \ - extras/package/macosx/Resources/skip_forward_embedded_blue.png \ - extras/package/macosx/Resources/skip_previous_embedded_blue.png \ extras/package/macosx/Resources/vlc.scriptSuite \ extras/package/macosx/Resources/vlc.scriptTerminology \ extras/package/macosx/Resources/README \ extras/package/macosx/Resources/add_embedded.png \ - extras/package/macosx/Resources/add_embedded_blue.png \ extras/package/macosx/Resources/repeat_embedded.png \ - extras/package/macosx/Resources/repeat_embedded_blue.png \ - extras/package/macosx/Resources/repeat_single_embedded_blue.png \ extras/package/macosx/Resources/shuffle_embedded.png \ - extras/package/macosx/Resources/shuffle_embedded_blue.png \ extras/package/macosx/Resources/fs_volume_slider_knob_highlight.png \ extras/package/macosx/Resources/fs_volume_slider_knob.png \ extras/package/macosx/Resources/fs_volume_slider_bar.png \ @@ -297,10 +275,6 @@ 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.in \ - extras/package/macosx/plugin/InstallerInfo.plist.in \ - extras/package/macosx/plugin/InstallerDescription.plist \ - extras/package/macosx/plugin/pbdevelopment.plist \ extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \ extras/package/macosx/eyetvplugin/Info.plist \ extras/package/macosx/eyetvplugin/eyetvplugin.c \ @@ -324,9 +298,6 @@ EXTRA_DIST += \ extras/misc/mpris.py \ extras/misc/mpris.glade -dist-hook: - distdir=$(distdir) srcdir=$(srcdir) $(SHELL) $(srcdir)/toolbox --dist-contrib - ############################################################################### # Building libvlc ############################################################################### @@ -354,7 +325,7 @@ libcompat: libvlc: libcompat cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la -core: libvlc vlc +core: libvlc vlc$(EXEEXT) cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) vlc-static$(EXEEXT) doc: @@ -362,32 +333,6 @@ doc: .PHONY: libvlc core doc -if HAVE_BEOS -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 $(CONTRIB_DIR)/vlc-lib ; then \ - mkdir -p $(top_builddir)/vlc-bundle/lib ; \ - for i in $(CONTRIB_DIR)/vlc-lib/*.so ; do \ - cp $$i $(top_builddir)/vlc-bundle/lib/ ; \ - done ; \ - fi - cat $(top_srcdir)/po/LINGUAS | while read i; do \ - mkdir -p "$(top_builddir)/vlc-bundle/share/locale/$$i/LC_MESSAGES" ; \ - cp "$(top_builddir)/po/$$i.gmo" \ - "$(top_builddir)/vlc-bundle/share/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \ - done - find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \; -endif - ############################################################################### # Building aliases ############################################################################### @@ -424,7 +369,7 @@ noinst_SCRIPTS += vlc$(EXEEXT) endif vlc$(EXEEXT): - $(AM_V_GEN)ln -sf bin/vlc-static$(EXEEXT) vlc$(EXEEXT) + $(AM_V_GEN)$(LN_S) -f bin/vlc-static$(EXEEXT) vlc$(EXEEXT) if HAVE_DARWIN if BUILD_MACOSX_VLC_APP @@ -456,6 +401,10 @@ VLC-release.app: vlc done mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle cp -R $(CONTRIB_DIR)/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle + mkdir -p $(top_builddir)/tmp/extras/contrib/BGHUDAppKit + cp -R $(CONTRIB_DIR)/BGHUDAppKit/BGHUDAppKit.framework $(top_builddir)/tmp/extras/contrib/BGHUDAppKit + mkdir -p $(top_builddir)/tmp/extras/contrib/Growl + cp -R $(CONTRIB_DIR)/Growl/Growl.framework $(top_builddir)/tmp/extras/contrib/Growl mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/gui/macosx for i in \ @@ -507,7 +456,7 @@ VLC-release.app: vlc $(top_builddir)/tmp/modules/gui/macosx; \ done $(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \ - xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \ + xcodebuild -target vlc SYMROOT=../../../build DSTROOT=../../../build $(silentstd) && \ cd ../../../../ && \ cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC-release.app; \ rm -Rf $(top_builddir)/tmp @@ -554,35 +503,15 @@ VLC-release.app: vlc $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/`basename $${i}` ; \ done $(INSTALL) -m 644 $(srcdir)/share/lua/http/requests/README.txt $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/README.txt - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests - $(INSTALL) -m 644 $(srcdir)/share/http/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/.hosts - for i in $(srcdir)/share/http/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \ - done - for i in $(srcdir)/share/http/dialogs/* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs/`basename $${i}` ; \ - done - for i in $(srcdir)/share/http/js/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js/`basename $${i}` ; \ - done - for i in $(srcdir)/share/http/images/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images/`basename $${i}` ; \ - done - for i in $(srcdir)/share/http/requests/*.* ; do \ - $(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.txt $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/README.txt + $(INSTALL) -m 644 $(srcdir)/share/vlc512x512.png $(top_builddir)/VLC-release.app/Contents/MacOS/share/vlc512x512.png $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale cat $(top_srcdir)/po/LINGUAS | while read i; do \ $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \ $(INSTALL) $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ mkdir -p $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ - ln -sf ../English.lproj/InfoPlist.strings \ + $(LN_S) -f ../English.lproj/InfoPlist.strings \ $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ - ln -sf ../English.lproj/MainMenu.nib \ + $(LN_S) -f ../English.lproj/MainMenu.nib \ $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ done printf "APPLVLC#" >| $(top_builddir)/VLC-release.app/Contents/PkgInfo @@ -609,6 +538,10 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib done mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle cp -R $(CONTRIB_DIR)/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle + mkdir -p $(top_builddir)/tmp/extras/contrib/BGHUDAppKit + cp -R $(CONTRIB_DIR)/BGHUDAppKit/BGHUDAppKit.framework $(top_builddir)/tmp/extras/contrib/BGHUDAppKit + mkdir -p $(top_builddir)/tmp/extras/contrib/Growl + cp -R $(CONTRIB_DIR)/Growl/Growl.framework $(top_builddir)/tmp/extras/contrib/Growl mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/gui/macosx for i in \ @@ -660,26 +593,26 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib $(top_builddir)/tmp/modules/gui/macosx; \ done $(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \ - xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \ + xcodebuild -target vlc SYMROOT=../../../build DSTROOT=../../../build $(silentstd) && \ cd ../../../../ && \ - cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC.app + cp -R -L $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC.app $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS touch $(top_builddir)/VLC.app/Contents/MacOS/VLC chmod +x $(top_builddir)/VLC.app/Contents/MacOS/VLC $(INSTALL) $(top_builddir)/bin/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC - ln -sf ../../../modules $(top_builddir)/VLC.app/Contents/MacOS/plugins + $(LN_S) -f ../../../modules $(top_builddir)/VLC.app/Contents/MacOS/plugins install -d $(top_builddir)/VLC.app/Contents/MacOS/share for i in `ls $(srcdir)/share`; do \ - ln -sf `pwd`/$(srcdir)/share/$$i $(top_builddir)/VLC.app/Contents/MacOS/share/; \ + $(LN_S) -f `pwd`/$(srcdir)/share/$$i $(top_builddir)/VLC.app/Contents/MacOS/share/; \ done $(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/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 ; \ + $(LN_S) -f `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 \ + $(LN_S) -f ../English.lproj/InfoPlist.strings \ $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \ - ln -sf ../English.lproj/MainMenu.nib \ + $(LN_S) -f ../English.lproj/MainMenu.nib \ $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \ done printf "APPLVLC#" >| $(top_builddir)/VLC.app/Contents/PkgInfo @@ -695,17 +628,34 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib ############################################################################ ## Win ## ############################################################################ +destdir=$(prefix) win32_destdir=$(top_builddir)/vlc-$(VERSION) -win32_xpi_destdir=$(win32_destdir)/vlc-plugin win32_debugdir=$(top_builddir)/symbols-$(VERSION) -npvlc=vlc-$(VERSION)/mozilla/npvlc$(LIBEXT) -axvlc=vlc-$(VERSION)/activex/axvlc$(LIBEXT) -win32_lua_destdir=$(win32_destdir)/lua -win32_http_destdir=$(win32_destdir)/http -destdir=_win32 +win32_xpi_destdir=$(win32_destdir)/vlc-plugin + +if HAVE_WIN64 +build-npapi: + touch $@ + +build-activex: + touch $@ +else +if HAVE_WINCE +build-npapi: + touch $@ + +build-activex: + touch $@ +else +if HAVE_WIN32 +include extras/package/npapi.am +include extras/package/activex.am +endif +endif +endif #Win-common is for win32 and wince -package-win-common: install +package-win-common: install build-npapi build-activex # Check that tmp isn't in the way @if test -e "$(win32_destdir)"; then \ echo "Error: please remove $(win32_destdir), it is in the way"; \ @@ -714,12 +664,12 @@ package-win-common: install echo "Error: please remove $(win32_debugdir), it is in the way"; \ false; \ else \ - echo "OK."; mkdir -p "$(win32_debugdir)"; \ - echo "OK."; mkdir -p "$(win32_destdir)"; \ + echo "Debug dir OK."; mkdir -p "$(win32_debugdir)"; \ + echo "Dest dir OK."; mkdir -p "$(win32_destdir)"; \ fi # Executables, major libs+manifests - find $(destdir) -maxdepth 4 -name "*$(LIBEXT)" -o -name "*$(EXEEXT)" -exec cp {} "$(win32_destdir)/" \; + find $(destdir) -maxdepth 4 \( -name "*$(LIBEXT)" -o -name "*$(EXEEXT)" \) -exec cp {} "$(win32_destdir)/" \; for file in $(top_srcdir)/extras/package/win32/vlc$(EXEEXT).manifest \ $(top_srcdir)/extras/package/win32/libvlc$(LIBEXT).manifest; \ do cp $$file "$(win32_destdir)/" ; done; @@ -731,65 +681,20 @@ package-win-common: install do cp "$(srcdir)/$$file" "$(win32_destdir)/$${file}.txt"; done # Necessary icon - cp $(srcdir)/share/icons/vlc.ico $(win32_destdir)/ + cp $(srcdir)/share/icons/vlc.ico $(win32_destdir) # Locales - cp -r $(destdir)/share/locale $(win32_destdir) + -cp -r $(destdir)/share/locale $(win32_destdir) # Plugins cp -r $(destdir)/lib/vlc/plugins $(win32_destdir) if BUILD_LUA -# Copy the lua scripts (HTTP) - mkdir -p $(win32_lua_destdir) - cp -r $(destdir)/share/vlc/lua/http "$(win32_lua_destdir)/http" - -# Lua Scripts - cannot be simplified yet, because make install doesn't install READMEs - $(INSTALL) -d $(win32_lua_destdir) - for i in $(srcdir)/share/lua/*.* ; do \ - $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/`basename $${i}` ; \ - done - $(INSTALL) -d $(win32_lua_destdir)/modules - for i in $(srcdir)/share/lua/modules/*.* ; do \ - $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/modules/`basename $${i}` ; \ - done - $(INSTALL) -d $(win32_lua_destdir)/extensions - for i in $(srcdir)/share/lua/extensions/*.* ; do \ - $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/extensions/`basename $${i}` ; \ - done - $(INSTALL) -d $(win32_lua_destdir)/intf - for i in $(srcdir)/share/lua/intf/*.* ; do \ - $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/intf/`basename $${i}` ; \ - done - $(INSTALL) -d $(win32_lua_destdir)/intf/modules - for i in $(srcdir)/share/lua/intf/modules/*.* ; do \ - $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/intf/modules/`basename $${i}` ; \ - done - $(INSTALL) -d $(win32_lua_destdir)/meta/art - for i in $(srcdir)/share/lua/meta/art/*.* ; do \ - $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/art/`basename $${i}` ; \ - done - $(INSTALL) -d $(win32_lua_destdir)/meta/fetcher - for i in $(srcdir)/share/lua/meta/fetcher/*.* ; do \ - $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/fetcher/`basename $${i}` ; \ - done - $(INSTALL) -d $(win32_lua_destdir)/meta/reader - for i in $(srcdir)/share/lua/meta/reader/*.* ; do \ - $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/reader/`basename $${i}` ; \ - done - $(INSTALL) -d $(win32_lua_destdir)/playlist - for i in $(srcdir)/share/lua/playlist/*.* ; do \ - $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \ - done - $(INSTALL) -d $(win32_lua_destdir)/sd - for i in $(srcdir)/share/lua/sd/*.* ; do \ - $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/sd/`basename $${i}` ; \ - done + mkdir -p $(win32_destdir)/lua + cp -r $(destdir)/lib/vlc/lua/* $(win32_destdir)/lua + cp -r $(destdir)/share/vlc/lua/* $(win32_destdir)/lua endif -if BUILD_HTTPD - cp -r $(destdir)/share/vlc/http $(win32_http_destdir) -endif if BUILD_SKINS cp -r $(destdir)/share/vlc/skins2 $(win32_destdir)/skins endif @@ -801,11 +706,13 @@ if BUILD_OSDMENU rm -f -- "$$file.tmp"; \ done endif -if BUILD_MOZILLA - cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir) +if !HAVE_WIN64 +if !HAVE_WINCE + cp "$(top_builddir)/activex-vlc/src/axvlc.dll.manifest" "$(win32_destdir)/" + cp "$(top_builddir)/activex-vlc/installed/lib/axvlc.dll" "$(win32_destdir)/" + cp "$(top_builddir)/npapi-vlc/src/npvlc.dll.manifest" "$(win32_destdir)/" + cp "$(top_builddir)/npapi-vlc/installed/lib/npvlc.dll" "$(win32_destdir)/" endif -if BUILD_ACTIVEX - cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir) endif # SDK @@ -813,26 +720,25 @@ endif cp -r $(destdir)/include "$(win32_destdir)/sdk" cp -r $(destdir)/lib/pkgconfig "$(win32_destdir)/sdk/lib" for file in libvlc.dll.a libvlc.la libvlccore.dll.a libvlccore.la; do \ - cp -r $(destdir)/lib/$$file "$(win32_destdir)/sdk/lib"; done -if BUILD_ACTIVEX - cp $(srcdir)/projects/activex/README.TXT $(win32_destdir)/sdk/ - cp $(srcdir)/projects/activex/test.html $(win32_destdir)/sdk/ + cp -rv $(destdir)/lib/$$file "$(win32_destdir)/sdk/lib"; done +if !HAVE_WIN64 +if !HAVE_WINCE + mkdir -p "$(win32_destdir)/sdk/activex" + cp $(top_builddir)/activex-vlc/README $(win32_destdir)/sdk/activex/README.TXT + cp $(top_builddir)/activex-vlc/src/test.html $(win32_destdir)/sdk/activex/ +endif endif - find $(win32_destdir) -type f -name "*xml" -or -name "*html" -or -name '*js' -or -name '*css' -or -name '*hosts' -or -iname '*txt' -or -name '*.cfg' -or -name '*lua' -exec $(U2D) {} \; + find $(win32_destdir) -type f \( -name "*xml" -or -name "*html" -or -name '*js' -or -name '*css' -or -name '*hosts' -or -iname '*txt' -or -name '*.cfg' -or -name '*.lua' \) -exec $(U2D) {} \; #Enable DEP and ASLR for all the binaries if USE_PEFLAGS - find $(win32_destdir) -type f -name '*$(LIBEXT)' -print -o -name '*$(EXEEXT)' -print -exec $(PEFLAGS) --dynamicbase=true --nxcompat=true {} \; + find $(win32_destdir) -type f \( -name '*$(LIBEXT)' -print -o -name '*$(EXEEXT)' -print \) -exec $(PEFLAGS) --dynamicbase=true --nxcompat=true {} \; endif -# Rebase all those DLLs to speed up loading (needs cygwin rebase) - if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \ - find $(win32_destdir) -type f -name '*$(LIBEXT)' -print | rebase -b 0x70000000 -T -; \ - fi + find $(win32_destdir)/plugins/ -type f \( -name '*.a' -or -name '*.la' \) -exec rm -rvf {} \; -# Strip DLLs -package-win-common-strip: package-win-common - find $(win32_destdir) -name '*$(LIBEXT)' -or -name '*$(EXEEXT)' | while read i; \ +package-win-base: package-win-common + find $(win32_destdir) -type f \( -name '*$(LIBEXT)' -or -name '*$(EXEEXT)' \) | while read i; \ do if test -n "$$i" ; then \ $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \ $(OBJCOPY) --strip-all "$$i" ; \ @@ -841,27 +747,31 @@ package-win-common-strip: package-win-common fi ; \ done -package-win32-webplugin-common: package-win-common-strip +package-win32-webplugin-common: package-win-base mkdir -p "$(win32_xpi_destdir)/plugins" find $(destdir) -maxdepth 4 -name "*$(LIBEXT)" -exec cp {} "$(win32_xpi_destdir)/" \; - cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins" +if !HAVE_WIN64 + cp $(top_builddir)/npapi-vlc/src/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins" +endif cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_xpi_destdir)/plugins" cp -r $(win32_destdir)/plugins/ "$(win32_xpi_destdir)/plugins" rm -rf "$(win32_xpi_destdir)/plugins/plugins/*qt*" rm -rf "$(win32_xpi_destdir)/plugins/plugins/*skins*" package-win32-xpi: package-win32-webplugin-common - cp $(top_builddir)/projects/mozilla/install.rdf "$(win32_xpi_destdir)" +if !HAVE_WIN64 + cp $(top_builddir)/npapi-vlc/src/install.rdf "$(win32_xpi_destdir)" cd $(win32_xpi_destdir) && zip -r "../vlc-$(VERSION).xpi" install.rdf plugins +endif package-win32-crx: package-win32-webplugin-common - cp $(top_builddir)/projects/mozilla/manifest.json "$(win32_xpi_destdir)" +if !HAVE_WIN64 + cp $(top_builddir)/npapi-vlc/src/manifest.json "$(win32_xpi_destdir)" crxmake --pack-extension "$(win32_xpi_destdir)" \ --extension-output "$(win32_destdir)/vlc-$(VERSION).crx" --ignore-file install.rdf +endif -package-win32-base: package-win-common-strip - -package-win32-base-exe: package-win32-base +package-win32-base-exe: package-win-base # Script installer cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(win32_destdir)/" cp "$(top_builddir)/extras/package/win32/spad.nsi" "$(win32_destdir)/" @@ -887,28 +797,28 @@ package-win32-base-exe: package-win32-base eval "$$MAKENSIS $(win32_destdir)/spad.nsi"; \ eval "$$MAKENSIS $(win32_destdir)/vlc.win32.nsi" -package-win32-base-zip: package-win32-base -# Create package +package-win32-base-zip: package-win-base +# Create package rm -f -- vlc-$(VERSION)-win32.zip zip -r -9 vlc-$(VERSION)-win32.zip vlc-$(VERSION) -package-win32-base-debug-zip: package-win32-base-debug +package-win32-base-debug-zip: package-win-common # Create package rm -f -- vlc-$(VERSION)-win32-debug.zip zip -r -9 vlc-$(VERSION)-win32-debug.zip vlc-$(VERSION) -package-win32-base-7zip: package-win32-base -# Create package +package-win32-base-7zip: package-win-base +# Create package 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$(VERSION)-win32.7z vlc-$(VERSION) -package-win32-base-debug-7zip: package-win32-base-debug +package-win32-base-debug-7zip: package-win-common # Create package 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$(VERSION)-win32-debug.7z vlc-$(VERSION) package-win32-cleanup: rm -Rf $(win32_destdir) $(win32_debugdir) -package-win32-exe: package-win32-base package-win32-base-exe package-win32-cleanup +package-win32-exe: package-win-base package-win32-base-exe package-win32-cleanup package-win32-zip: package-win32-base-zip package-win32-cleanup @@ -918,19 +828,20 @@ package-win32-7zip: package-win32-base-7zip package-win32-cleanup package-win32-debug-7zip: package-win32-base-debug-7zip package-win32-cleanup -package-win32-no-clean: package-win32-base-zip package-win32-base-7zip package-win32-base-exe +package-win32-no-clean: package-win32-base-zip package-win32-base-7zip package-win32-base-exe package-win32-xpi package-win32: package-win32-no-clean package-win32-cleanup package-win32-debug: package-win32-base-debug-zip package-win32-base-debug-7zip package-win32-cleanup + ####### # WinCE ####### -package-wince-base: package-win-common-strip +package-wince-base: package-win-base package-wince-base-zip: package-wince-base -# Create package +# Create package rm -f -- vlc-$(VERSION)-wince.zip zip -r -9 vlc-$(VERSION)-wince.zip vlc-$(VERSION) @@ -964,7 +875,7 @@ package-macosx: VLC-release.app ChangeLog cp -L $(top_builddir)/ChangeLog $(top_builddir)/vlc-$(VERSION)/Goodies/ # Place a link to the application folder - ln -s /Applications $(top_builddir)/vlc-$(VERSION)/Applications + $(LN_S) /Applications $(top_builddir)/vlc-$(VERSION)/Applications # Create disk image (temporarily taken from the 0.8.6-bugfix branch to provide reliable NBs) echo "Creating disk image" @@ -1036,49 +947,6 @@ package-macosx-framework-zip: zip -r -y -9 $(top_builddir)/vlckit-$(VERSION).zip $(top_builddir)/vlckit-$(VERSION) rm -Rf $(top_builddir)/vlc-$(VERSION) -package-macosx-plugin: -if BUILD_MOZILLA -# Create Installer - rm -rf "$(top_builddir)/macosx-plugin-instdata/"; true - mkdir -p "$(top_builddir)/macosx-plugin-instdata" - rm -f "$(top_builddir)/projects/mozilla/VLC Plugin.plugin/Contents/MacOS/modules/libmacosx_plugin.dylib" - cp -R "$(top_builddir)/projects/mozilla/VLC Plugin.plugin" "$(top_builddir)/macosx-plugin-instdata" - rm -rf "$(top_builddir)/VLC Internet Plug-In.pkg" - export PACKAGEMAKER= - if test -x /Developer/Tools/packagemaker; then \ - export PACKAGEMAKER=/Developer/Tools/packagemaker; \ - fi; \ - if test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then \ - export PACKAGEMAKER=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; \ - fi; \ - $${PACKAGEMAKER} -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \ - -f "$(top_builddir)/macosx-plugin-instdata" \ - -i "$(top_builddir)/extras/package/macosx/plugin/InstallerInfo.plist" \ - -d "$(top_srcdir)/extras/package/macosx/plugin/InstallerDescription.plist"; true - rm -rf "$(top_builddir)/macosx-plugin-instdata/" - -# Create disk image - rm -f "$(top_builddir)/vlc-plugin-$(VERSION).dmg"; true - rm -rf "$(top_builddir)/vlc-plugin-$(VERSION)/"; true - mkdir -p "$(top_builddir)/vlc-plugin-$(VERSION)/" - mv "$(top_builddir)/VLC Internet Plug-In.pkg" "$(top_builddir)/vlc-plugin-$(VERSION)/" - hdiutil create -srcfolder "$(top_builddir)/vlc-plugin-$(VERSION)" \ - "$(top_builddir)/vlc-plugin-$(VERSION).dmg" -format UDBZ \ - -scrub -imagekey zlib-level=9 - echo "Disk image creation completed:" - rm -rf "$(top_builddir)/vlc-plugin-$(VERSION)" -endif - -package-macosx-xpi: -if BUILD_MOZILLA - mkdir -p "$(top_builddir)/macosx-xpi/plugins" - cp $(top_builddir)/projects/mozilla/install.rdf \ - "$(top_builddir)/macosx-xpi/" - cp -R "$(top_builddir)/projects/mozilla/VLC Plugin.plugin" \ - "$(top_builddir)/macosx-xpi/plugins" - cd "$(top_builddir)/macosx-xpi" && zip -r vlc-$(VERSION).xpi install.rdf plugins -endif - package-translations: @if test -e "$(srcdir)/vlc-translations-$(VERSION)"; then \ echo "Error: please remove $(srcdir)/vlc-translations-$(VERSION), it is in the way"; \