X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=402803d96f37ccc80ea50406ee09413defbd97d5;hb=5aa95193923fee9ff548e8504ae51e1767230906;hp=f45388795fc4286092810ea395de950f2d853054;hpb=65052fefa352631a8585aa2f758e94633f0bc485;p=vlc diff --git a/Makefile.am b/Makefile.am index f45388795f..402803d96f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,11 +36,11 @@ EXTRA_DIST = \ INSTALL.win32 \ INSTALL.wince \ extras/package/win32/vlc.exe.manifest \ + extras/package/win32/libvlc.dll.manifest \ MAINTAINERS \ extras/package/macosx/README.MacOSX.rtf \ vlc-config.in.in \ extras/package/rpm/vlc.fedora.spec \ - extras/package/rpm/vlc.mandriva.spec \ extras/package/rpm/vlc.altlinux.spec \ extras/package/win32/vlc.win32.nsi.in \ extras/package/win32/languages/declaration.nsh \ @@ -48,8 +48,9 @@ EXTRA_DIST = \ extras/package/win32/languages/french.nsh dist_noinst_SCRIPTS = bootstrap toolbox +nodist_noinst_SCRIPTS = compile -BUILT_SOURCES_distclean = vlc-config compile extras/package/win32/vlc.win32.nsi +BUILT_SOURCES_distclean = vlc-config extras/package/win32/vlc.win32.nsi if HAVE_DARWIN BUILT_SOURCES_clean = macosx-sdk else @@ -358,7 +359,7 @@ endif # Building aliases ############################################################################### -ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc +ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc mvlc bin_SCRIPTS = $(ALIASES) CLEANFILES += $(ALIASES) $(noinst_SCRIPTS) EXTRA_SCRIPTS = $(ALL_ALIASES) @@ -367,24 +368,27 @@ dist_noinst_SCRIPTS += make-alias MKALIAS = bindir="$(bindir)" transform="$(transform)" program_prefix="$(program_prefix)" program_suffix="$(program_suffix)" $(top_srcdir)/make-alias $@ -cvlc: make-alias +cvlc: make-alias Makefile $(MKALIAS) dummy -rvlc: make-alias +rvlc: make-alias Makefile $(MKALIAS) rc -svlc: make-alias +svlc: make-alias Makefile $(MKALIAS) skins2 -wxvlc: make-alias +wxvlc: make-alias Makefile $(MKALIAS) wx -qvlc: make-alias +qvlc: make-alias Makefile $(MKALIAS) qt4 -nvlc: make-alias +nvlc: make-alias Makefile $(MKALIAS) ncurses +mvlc: make-alias Makefile + $(MKALIAS) maemo + if BUILD_VLC noinst_SCRIPTS += vlc$(EXEEXT) endif @@ -413,7 +417,7 @@ VLC-release.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 - REVISION=`git describe` && \ + REVISION=`git describe --always` && \ cat $(top_builddir)/extras/package/macosx/Info.plist | \ sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/ @@ -453,7 +457,6 @@ VLC-release.app: vlc simple_prefs.h \ simple_prefs.m \ vout.h \ - voutqt.m \ voutgl.m \ wizard.h \ wizard.m \ @@ -566,6 +569,8 @@ VLC-release.app: vlc $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ done printf "APPLVLC#" >| $(top_builddir)/VLC-release.app/Contents/PkgInfo + find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name classes.nib -delete; + find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name info.nib -delete; find $(top_builddir)/VLC-release.app -type d -exec chmod ugo+rx '{}' \; find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \; @@ -579,7 +584,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \ cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ done - REVISION=`git describe` && \ + REVISION=`git describe --always` && \ cat $(top_builddir)/extras/package/macosx/Info.plist | \ sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/ @@ -619,7 +624,6 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib simple_prefs.h \ simple_prefs.m \ vout.h \ - voutqt.m \ voutgl.m \ wizard.h \ wizard.m \ @@ -693,6 +697,7 @@ package-win-common: # Copy executables and libs cp "$(top_builddir)/bin/.libs/vlc$(EXEEXT)" "$(win32_destdir)/" cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(win32_destdir)/" + cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_destdir)/" cp "$(top_builddir)/src/.libs/libvlccore$(LIBEXT)" "$(win32_destdir)/" cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "$(win32_destdir)/" @@ -701,10 +706,10 @@ package-win-common: do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(win32_destdir)/$${file}.txt" ; done; for file in NEWS COPYING README; \ do cp "$(srcdir)/$$file" "$(win32_destdir)/$${file}.txt"; done - unix2dos "$(win32_destdir)/"*.txt + unix2dos "$(win32_destdir)/"*.txt || echo "WARNING: this shouldn't happen" # Necessary icons - cp $(srcdir)/share/vlc48x48.ico $(win32_destdir)/ + cp $(srcdir)/share/vlc.ico $(win32_destdir)/ # Copy the locales mkdir -p $(win32_destdir)/locale @@ -721,6 +726,7 @@ package-win-common: if BUILD_MOZILLA mkdir -p "$(win32_destdir)/mozilla" cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(win32_destdir)/mozilla/ + cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)/mozilla/ endif # ActiveX plugin @@ -731,6 +737,7 @@ if BUILD_ACTIVEX unix2dos $(win32_destdir)/activex/* cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(win32_destdir)/activex/ + cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)/activex/ endif # Rebase all those DLLs to speed up loading (need cygwin rebase) @@ -752,6 +759,9 @@ package-win32-base-debug: package-win-common $(INSTALL) "$$i" "vlc-$(VERSION)/plugins/" ; \ fi ; done +# Contrib *.dll's + cp $(srcdir)/extras/contrib/lib/*.dll "vlc-$(VERSION)/" || true + # Copy the lua scripts (HTTP) if BUILD_LUA mkdir -p "$(win32_lua_destdir)/http/images" @@ -850,9 +860,7 @@ if BUILD_SKINS done for i in $(top_builddir)/share/skins2/*.*; do \ cp -- "$$i" $(win32_destdir)/skins/ || true ; \ - done \ - cp -v share/skins2/default.vlt $(win32_destdir)/skins/ || true ; - + done endif if BUILD_OSDMENU @@ -885,9 +893,8 @@ endif #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)" + for i in "" vlc-$(VERSION)/*$(LIBEXT) ; \ + do if test -n "$$i" ; then $(STRIP) "$$i" ; fi; done if BUILD_MOZILLA $(STRIP) "vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)" endif @@ -1118,7 +1125,14 @@ if BUILD_MOZILLA mkdir -p "$(top_builddir)/macosx-plugin-instdata" cp -R "$(top_builddir)/projects/mozilla/VLC Plugin.plugin" "$(top_builddir)/macosx-plugin-instdata" rm -rf "$(top_builddir)/VLC Internet Plug-In.pkg" - PATH=/Developer/usr/bin:/Developer/Tools:$$PATH packagemaker -build -ds -p "$(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 "$(srcdir)/extras/package/macosx/plugin/InstallerInfo.plist" \ -d "$(srcdir)/extras/package/macosx/plugin/InstallerDescription.plist"; true