X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=c69a742c8fc3bc2484e809b9c0013edb8580bb5e;hb=05f47b33270fcf5a8f78f1627ab640ede396ac4d;hp=a351c84a6ec094c603e6df0851ffd8a7d781f6ad;hpb=829dfdeda2a4c39ab7c976c6b3dd7613ee363c1e;p=vlc diff --git a/Makefile.am b/Makefile.am index a351c84a6e..c69a742c8f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,24 +2,37 @@ # Automake targets and declarations ############################################################################### +# Pass --quiet to make when we are not verbose. +AM_MAKEFLAGS = $(makesilentflags_$(V)) +makesilentflags_ = $(makesilentflags__$(AM_DEFAULT_VERBOSITY)) +makesilentflags__0 = --quiet + # 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 # - libs/* are needed by modules -BASE_SUBDIRS = po src modules share doc test +BASE_SUBDIRS = po compat src bin modules share doc test EXTRA_SUBDIRS = m4 extras/package/ipkg \ - libs/loader libs/srtp \ + libs/loader libs/srtp libs/unzip \ projects/mozilla projects/activex DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS) -SUBDIRS = po src +SUBDIRS = po compat src if LOADER SUBDIRS += libs/loader endif if HAVE_LIBGCRYPT SUBDIRS += libs/srtp endif +if HAVE_ZLIB +if !HAVE_MINIZIP +SUBDIRS += libs/unzip +endif +endif +if BUILD_VLC +SUBDIRS += bin +endif SUBDIRS += modules share doc test if BUILD_MOZILLA SUBDIRS += projects/mozilla @@ -33,17 +46,21 @@ 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/vlc.win32.nsi.in \ + extras/package/win32/languages/declaration.nsh \ + extras/package/win32/languages/english.nsh \ + 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 @@ -58,7 +75,8 @@ DISTCHECK_CONFIGURE_FLAGS = \ --enable-fast-install \ --disable-dbus \ --disable-dvd --disable-mad --disable-libmpeg2 \ - --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 \ + --disable-ffmpeg --disable-faad --disable-skins2 \ + --disable-live555 \ --disable-fribidi --disable-glx ACLOCAL_AMFLAGS = -I m4 @@ -73,74 +91,54 @@ AUTOMAKE_OPTIONS = \ ChangeLog: Makefile.am rm -f -- "$@" cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs - ln -sf doc/ChangeLog-2008 "$@" + ln -sf doc/ChangeLog-2009 "$@" ############################################################################### # MacOS X project ############################################################################### EXTRA_DIST += \ - extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/MediaInfo.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/MediaInfo.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/MediaInfo.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/MediaInfo.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/About.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/About.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/About.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/About.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Open.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Open.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Preferences.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Wizard.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Wizard.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Wizard.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/Wizard.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/Bookmarks.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Bookmarks.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Bookmarks.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib \ - 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/designable.nib \ extras/package/macosx/Resources/English.lproj/Extended.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 \ - extras/package/macosx/Resources/English.lproj/Interaction.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/Interaction.nib/info.nib \ - extras/package/macosx/Resources/English.lproj/Interaction.nib/keyedobjects.nib \ - 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/CoreDialogs.nib/designable.nib \ + extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/designable.nib \ + extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/keyedobjects.nib \ 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 \ - extras/package/macosx/Resources/asx.icns \ + extras/package/macosx/Resources/dsa_pub.pem \ + extras/package/macosx/Resources/aiff.icns \ + extras/package/macosx/Resources/audio.icns \ extras/package/macosx/Resources/avi.icns \ - extras/package/macosx/Resources/bin.icns \ - extras/package/macosx/Resources/cue.icns \ - extras/package/macosx/Resources/dat.icns \ - extras/package/macosx/Resources/divx.icns \ - extras/package/macosx/Resources/dv.icns \ + extras/package/macosx/Resources/flv.icns \ extras/package/macosx/Resources/generic.icns \ - extras/package/macosx/Resources/m3u.icns \ + extras/package/macosx/Resources/m4a.icns \ + extras/package/macosx/Resources/m4v.icns \ + extras/package/macosx/Resources/mkv.icns \ extras/package/macosx/Resources/mov.icns \ + extras/package/macosx/Resources/movie.icns \ extras/package/macosx/Resources/mp3.icns \ - extras/package/macosx/Resources/mp4.icns \ extras/package/macosx/Resources/mpeg.icns \ - extras/package/macosx/Resources/mpeg1.icns \ - extras/package/macosx/Resources/mpeg2.icns \ - extras/package/macosx/Resources/mpeg4.icns \ - extras/package/macosx/Resources/mpg.icns \ extras/package/macosx/Resources/ogg.icns \ - extras/package/macosx/Resources/ogm.icns \ - extras/package/macosx/Resources/pls.icns \ - extras/package/macosx/Resources/srt.icns \ - extras/package/macosx/Resources/sub.icns \ - extras/package/macosx/Resources/vlc.icns \ + extras/package/macosx/Resources/playlist.icns \ + extras/package/macosx/Resources/rm.icns \ + extras/package/macosx/Resources/subtitle.icns \ extras/package/macosx/Resources/vob.icns \ + extras/package/macosx/Resources/wav.icns \ + extras/package/macosx/Resources/vlc.icns \ extras/package/macosx/Resources/wma.icns \ extras/package/macosx/Resources/wmv.icns \ extras/package/macosx/Resources/pause.png \ @@ -238,6 +236,28 @@ EXTRA_DIST += \ extras/package/macosx/Resources/skip_previous_graphite.png \ extras/package/macosx/Resources/stop_graphite.png \ extras/package/macosx/Resources/volumeslider_graphite.png \ + extras/package/macosx/Resources/backward_big_down.png \ + extras/package/macosx/Resources/backward_big.png \ + extras/package/macosx/Resources/eq_sm.pdf \ + extras/package/macosx/Resources/forward_big_down.png \ + extras/package/macosx/Resources/forward_big.png \ + extras/package/macosx/Resources/fs_sm.pdf \ + extras/package/macosx/Resources/list_sm.pdf \ + extras/package/macosx/Resources/next_sm.pdf \ + extras/package/macosx/Resources/pause_big_down.png \ + extras/package/macosx/Resources/pause_big.png \ + extras/package/macosx/Resources/play_big_down.png \ + extras/package/macosx/Resources/play_big.png \ + extras/package/macosx/Resources/prev_sm.pdf \ + extras/package/macosx/Resources/sidebarAdd.png \ + extras/package/macosx/Resources/sidebarRepeat.png \ + extras/package/macosx/Resources/sidebarRepeatOn.png \ + extras/package/macosx/Resources/sidebarRepeatOneOn.png \ + extras/package/macosx/Resources/sidebarResizeWidget.png \ + extras/package/macosx/Resources/sidebarShuffle.png \ + extras/package/macosx/Resources/sidebarShuffleOn.png \ + extras/package/macosx/Resources/sidebarStatusAreaBackground.png \ + extras/package/macosx/Resources/stop_sm.pdf \ extras/package/macosx/Resources/noart.png \ extras/package/macosx/Resources/spref_cone_Audio_64.png \ extras/package/macosx/Resources/spref_cone_Hotkeys_64.png \ @@ -259,7 +279,6 @@ EXTRA_DIST += \ 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.in \ extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \ extras/package/macosx/eyetvplugin/Info.plist \ extras/package/macosx/eyetvplugin/eyetvplugin.c \ @@ -301,18 +320,25 @@ vlc-config.in: vlc-config.in.in touch $@ CLEANFILES = $(BUILT_SOURCES_clean) -DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile ChangeLog +DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile +MAINTAINERCLEANFILES = ChangeLog -# Shortcut for developpers to rebuild the core (libvlc + vlc) +# Shortcut for developers to rebuild the core (libvlc + vlc) # Don't use it if you don't know what it is about. # Don't complain if it doesn't work. -- Courmisch -libvlc: - cd src && $(MAKE) $(AM_MAKEFLAGS) libvlccore.la +libcompat: + cd compat && $(MAKE) $(AM_MAKEFLAGS) -core: - cd src && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) +libvlc: libcompat + cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la -.PHONY: libvlc core +core: libvlc + cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) + +doc: + cd doc && $(MAKE) $(AM_MAKEFLAGS) doc + +.PHONY: libvlc core doc #To get some nice output nice: @@ -337,9 +363,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 +374,7 @@ endif # Building aliases ############################################################################### -ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc +ALL_ALIASES = cvlc rvlc svlc qvlc nvlc mvlc bin_SCRIPTS = $(ALIASES) CLEANFILES += $(ALIASES) $(noinst_SCRIPTS) EXTRA_SCRIPTS = $(ALL_ALIASES) @@ -357,34 +383,30 @@ 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 - $(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 -vlc$(EXEEXT): Makefile.am - rm -f -- vlc vlc.tmp - echo '#! /bin/sh' > vlc.tmp - echo 'exec "$$(dirname "$$0")/src/vlc$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp - chmod +x vlc.tmp - mv -f -- vlc.tmp vlc +vlc$(EXEEXT): + ln -sf bin/vlc-static$(EXEEXT) vlc$(EXEEXT) if HAVE_DARWIN if BUILD_VLC @@ -393,22 +415,31 @@ noinst_DATA = VLC.app endif endif +xcodebuild_FLAGS = $(xcodebuildsilentflags_$(V)) +xcodebuildsilentflags_ = $(xcodebuildsilentflags__$(AM_DEFAULT_VERBOSITY)) +xcodebuildsilentflags_0 = 2>&1 >/dev/null +# '__' prefix trick for old automake version. +xcodebuildsilentflags__0 = $(xcodebuildsilentflags_0) + # VLC-release.app for packaging and giving it to your friends # use package-macosx to get a nice dmg VLC-release.app: vlc - ( cd src && make install ) + ( cd src && $(MAKE) $(AM_MAKEFLAGS) install ) 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 \ 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 + 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/ for i in AUTHORS COPYING THANKS; do \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ done + mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle + cp -R $(top_srcdir)/extras/contrib/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/gui/macosx for i in \ @@ -442,7 +473,6 @@ VLC-release.app: vlc simple_prefs.h \ simple_prefs.m \ vout.h \ - voutqt.m \ voutgl.m \ wizard.h \ wizard.m \ @@ -450,10 +480,8 @@ VLC-release.app: vlc extended.m \ bookmarks.h \ bookmarks.m \ - update.h \ - update.m \ - interaction.h \ - interaction.m \ + coredialogs.h \ + coredialogs.m \ embeddedwindow.h \ embeddedwindow.m \ fspanel.h \ @@ -462,13 +490,17 @@ VLC-release.app: vlc cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ - cd ../../../../ && \ - cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \ - $(top_builddir)/VLC-release.app; \ + $(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \ + xcodebuild -target vlc $(xcodebuild_FLAGS) && \ + cd ../../../../ && \ + cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle $(top_builddir)/VLC-release.app; \ rm -Rf $(top_builddir)/tmp $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS - ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh + PRODUCT="VLC-release.app" ACTION="release-makefile" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua + for i in $(srcdir)/share/lua/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/`basename $${i}` ; \ + done ; \ $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist for i in $(srcdir)/share/lua/playlist/*.* ; do \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist/`basename $${i}` ; \ @@ -508,13 +540,9 @@ VLC-release.app: vlc $(INSTALL) -m 644 $(srcdir)/share/lua/http/requests/readme $(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/old - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm $(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 - $(INSTALL) -m 644 $(srcdir)/share/http/old/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/.hosts for i in $(srcdir)/share/http/*.* ; do \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \ done @@ -524,15 +552,6 @@ VLC-release.app: vlc 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/old/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/`basename $${i}` ; \ - done - for i in $(srcdir)/share/http/old/admin/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin/`basename $${i}` ; \ - done - for i in $(srcdir)/share/http/old/vlm/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm/`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 @@ -540,10 +559,10 @@ 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 ; \ - cp $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ + $(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 \ $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ @@ -551,12 +570,13 @@ 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 designable.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 '{}' \; # This is just for development purposes. -# The resulting VLC.app will only in this tree. -VLC.app: vlc +# The resulting VLC.app will only run in this tree. +VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.libs/libvlc.dylib (cd src && make install) rm -Rf $(top_builddir)/tmp mkdir -p "$(top_builddir)/tmp/extras/package/macosx" @@ -564,12 +584,15 @@ 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 + 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/ for i in AUTHORS COPYING THANKS; do \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ done + mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle + cp -R $(top_srcdir)/extras/contrib/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/gui/macosx for i in \ @@ -603,7 +626,6 @@ VLC.app: vlc simple_prefs.h \ simple_prefs.m \ vout.h \ - voutqt.m \ voutgl.m \ wizard.h \ wizard.m \ @@ -611,10 +633,8 @@ VLC.app: vlc extended.m \ bookmarks.h \ bookmarks.m \ - update.h \ - update.m \ - interaction.h \ - interaction.m \ + coredialogs.h \ + coredialogs.m \ embeddedwindow.h \ embeddedwindow.m \ fspanel.h \ @@ -623,26 +643,23 @@ VLC.app: vlc cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ - cd ../../../../ && \ - cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \ - $(top_builddir)/VLC.app - rm -Rf $(top_builddir)/tmp + $(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \ + xcodebuild -target vlc $(xcodebuild_FLAGS) && \ + cd ../../../../ && \ + cp -R $(top_builddir)/tmp/extras/package/macosx/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)/src/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC - $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules - find modules/ -name '*_plugin$(LIBEXT)' | while read i; do \ - if test -n "$$i" ; \ - then ln -sfn "`pwd`/$$i" \ - "$(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) $(top_builddir)/bin/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC + ln -sf ../../../modules $(top_builddir)/VLC.app/Contents/MacOS/modules + 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/; \ + 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/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 ; \ @@ -659,184 +676,197 @@ VLC.app: vlc # the same setup as the maintaner(s). # +############################################################################ +## Win ## +############################################################################ +win32_destdir=$(top_builddir)/vlc-$(VERSION) +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 + #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 # Copy executables and libs - 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)/" + 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)/" # 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 || echo "WARNING: this shouldn't happen" # Necessary icons - cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-$(VERSION)/ + cp $(srcdir)/share/vlc.ico $(win32_destdir)/ # Copy the locales - mkdir -p $(top_builddir)/vlc-$(VERSION)/locale + mkdir -p $(win32_destdir)/locale cat $(top_srcdir)/po/LINGUAS | while read i; do \ - mkdir -p "$(top_builddir)/vlc-$(VERSION)/locale/$${i}/LC_MESSAGES" ; \ + mkdir -p "$(win32_destdir)/locale/$${i}/LC_MESSAGES" ; \ cp "$(srcdir)/po/$${i}.gmo" \ - "$(top_builddir)/vlc-$(VERSION)/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 # 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/ + cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(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/ + cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(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-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)/" + mkdir "$(win32_destdir)/languages" + cp $(srcdir)/extras/package/win32/languages/*.nsh "$(win32_destdir)/languages/" # 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 +# Contrib *.dll's + cp $(srcdir)/extras/contrib/lib/*.dll "vlc-$(VERSION)/" || true + # Copy the lua scripts (HTTP) 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 + 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) + for i in $(srcdir)/share/lua/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/`basename $${i}` ; \ + done + $(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 "$(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/ + mkdir -p "$(win32_http_destdir)/images" + mkdir -p "$(win32_http_destdir)/requests" + mkdir -p "$(win32_http_destdir)/js" + mkdir -p "$(win32_http_destdir)/dialogs" + 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 + endif if BUILD_SKINS # Skins - mkdir -p $(top_builddir)/vlc-$(VERSION)/skins/fonts + mkdir -p $(win32_destdir)/skins/fonts for i in $(srcdir)/share/skins2/fonts/*.*; do \ - cp -- "$$i" $(top_builddir)/vlc-$(VERSION)/skins/fonts/ || true ; \ + cp -- "$$i" $(win32_destdir)/skins/fonts/ || true ; \ done - for i in $(srcdir)/share/skins2/*.*; do \ - cp -- "$$i" $(top_builddir)/vlc-$(VERSION)/skins/ || true ; \ + for i in $(top_builddir)/share/skins2/*.*; do \ + cp -- "$$i" $(win32_destdir)/skins/ || true ; \ done + cp -- $(srcdir)/share/skins2/skin.catalog $(win32_destdir)/skins/ || true ; + cp -- $(srcdir)/share/skins2/skin.dtd $(win32_destdir)/skins/ || true ; endif if BUILD_OSDMENU #OSD Menu - mkdir -p "$(top_builddir)/vlc-$(VERSION)/osdmenu" - cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-$(VERSION)/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)/osdmenu/$$dir"; \ - for file in $(srcdir)/share/osdmenu/$${dir}/* ;do \ - cp -- "$$file" "$(top_builddir)/vlc-$(VERSION)/osdmenu/$$dir"; \ + mkdir -p "$(win32_destdir)/osdmenu" + cp $(srcdir)/share/osdmenu/*.* "$(win32_destdir)/osdmenu" + for dir in default default/selected default/selection default/volume ;do \ + 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)/osdmenu/*.cfg; - for file in $(top_builddir)/vlc-$(VERSION)/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"; \ @@ -844,8 +874,8 @@ if BUILD_OSDMENU endif # SDK - mkdir -p "$(top_builddir)/vlc-$(VERSION)/sdk.tmp" - mkdir -p "$(top_builddir)/vlc-$(VERSION)/sdk" + mkdir -p "$(win32_destdir)/sdk.tmp" + mkdir -p "$(win32_destdir)/sdk" d=$$(pwd) && \ cd src && \ make install DESTDIR="$$d/vlc-$(VERSION)/sdk.tmp" @@ -853,23 +883,35 @@ endif 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 - + @if test -e "$(win32_debugdir)"; then \ + echo "Error: please remove $(win32_debugdir), it is in the way"; \ + false; \ + else \ + echo "OK."; mkdir -p "$(win32_debugdir)"; \ + fi + for i in "" vlc-$(VERSION)/*$(LIBEXT) ; \ + do if test -n "$$i" ; then \ + $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \ + $(OBJCOPY) --strip-all "$$i" ; \ + $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \ + mv "$$i.dbg" "$(win32_debugdir)"; \ + fi; done + +#strip all plugins dll package-win32-base: package-win-common-strip - for i in "" $(top_builddir)/vlc-$(VERSION)/plugins/*$(LIBEXT) ; \ - do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done + for i in "" $(win32_destdir)/plugins/*$(LIBEXT) ; \ + do if test -n "$$i" ; then \ + $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \ + $(OBJCOPY) --strip-all "$$i" ; \ + $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \ + mv "$$i.dbg" "$(win32_debugdir)"; \ + 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"; \ elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \ @@ -881,45 +923,55 @@ package-win32-base-exe: package-win32-base 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 $(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-debug-zip: package-win32-base-debug +# 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 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 +# Create package + 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$(VERSION)-win32-debug.7z vlc-$(VERSION) + package-win32-exe: package-win32-base package-win32-base-exe # Clean up - rm -Rf $(top_builddir)/vlc-$(VERSION) + rm -Rf $(win32_destdir) -package-win32-exe-linux: package-win32-base package-win32-base-exe-linux +package-win32-zip: package-win32-base-zip # Clean up - rm -Rf $(top_builddir)/vlc-$(VERSION) + rm -Rf $(win32_destdir) -package-win32-zip: package-win32-base-zip +package-win32-debug-zip: package-win32-base-debug-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-debug-7zip: package-win32-base-debug-7zip +# Clean up + 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-win32-debug: package-win32-base-debug-zip package-win32-base-debug-7zip +# Clean up + rm -Rf $(win32_destdir) package-wince-base: package-win-common package-win-common-strip @@ -929,9 +981,12 @@ 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) +##################################################################### +## BeOS ## +##################################################################### package-beos: # Check that tmp isn't in the way @if test -e $(srcdir)/tmp; then \ @@ -967,7 +1022,10 @@ package-beos: # Clean up rm -Rf $(srcdir)/tmp -package-macosx: +######################################################################### +## MacOS X ## +######################################################################### +package-macosx: VLC-release.app ChangeLog # Check that the temporary location isn't in the way @if test -e "$(top_builddir)/vlc-$(VERSION)/"; then \ rm -Rf "$(top_builddir)/vlc-$(VERSION)/" ; \ @@ -982,12 +1040,13 @@ package-macosx: else \ cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/vlc-$(VERSION)/VLC.app"; \ fi - cd "$(srcdir)" && mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies/ && \ + mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies/ && \ mkdir -p $(top_builddir)/vlc-$(VERSION)/.background/ && \ - cp AUTHORS COPYING ChangeLog README THANKS NEWS $(top_builddir)/vlc-$(VERSION)/Goodies/ && \ - cp -R extras/package/macosx/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app && \ - cp extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf && \ - cp extras/package/macosx/Resources/about_bg.png $(top_builddir)/vlc-$(VERSION)/.background/background.png + cp $(srcdir)/AUTHORS $(srcdir)/COPYING $(srcdir)/README $(srcdir)/THANKS $(srcdir)/NEWS $(top_builddir)/vlc-$(VERSION)/Goodies/ && \ + cp -R $(srcdir)/extras/package/macosx/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app && \ + cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf && \ + cp $(srcdir)/extras/package/macosx/Resources/about_bg.png $(top_builddir)/vlc-$(VERSION)/.background/background.png + 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 @@ -1025,7 +1084,7 @@ package-macosx: # Note: We can't directly create a read only dmg as we do the bless stuff echo "Make the disk image read-only" mv "$(top_builddir)/vlc-$(VERSION).dmg" "$(top_builddir)/vlc-$(VERSION)-rw.dmg" - hdiutil convert "$(top_builddir)/vlc-$(VERSION)-rw.dmg" -format UDZO -o "$(top_builddir)/vlc-$(VERSION).dmg" + hdiutil convert "$(top_builddir)/vlc-$(VERSION)-rw.dmg" -format UDBZ -o "$(top_builddir)/vlc-$(VERSION).dmg" rm "$(top_builddir)/vlc-$(VERSION)-rw.dmg" # We are done @@ -1035,7 +1094,7 @@ package-macosx: # Clean up rm -Rf "$(top_builddir)/vlc-$(VERSION)" -package-macosx-zip: +package-macosx-zip: VLC-release.app rm -Rf $(top_builddir)/vlc-$(VERSION) mkdir -p $(top_builddir)/vlc-$(VERSION) cp -R $(top_builddir)/VLC-release.app $(top_builddir)/vlc-$(VERSION)/VLC.app @@ -1046,7 +1105,7 @@ package-macosx-zip: cp -R $(srcdir)/extras/package/macosx/Delete_Preferences.app \ $(top_builddir)/vlc-$(VERSION)/Goodies cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf \ - $(top_builddir)/vlc-$(VERSION) + $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf zip -r $(top_builddir)/vlc-$(VERSION).zip $(top_builddir)/vlc-$(VERSION) rm -Rf $(top_builddir)/vlc-$(VERSION) @@ -1067,12 +1126,20 @@ 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" - 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 + -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 @@ -1081,7 +1148,7 @@ if BUILD_MOZILLA 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 UDZO \ + "$(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)" @@ -1117,40 +1184,12 @@ package-translations: ############################################################################### # PO translation files update -# Generate po/POTFILES.in which lists all the files containing translatable -# strings. Find all source files and remove the generated files ############################################################################### .PHONY: update-po update-po: - rm -f $(top_srcdir)/po/POTFILES.in - { \ - cd $(top_srcdir) && \ - echo "# automatically created by make update-po" ; \ - echo "" ; \ - echo "# main sources" ; \ - find include src -name '*.[chm]' -o -name '*.[ch]pp' \ - | grep -v '\(misc/modules_\|src/misc/revision.c\|modules/builtin.h\|include/vlc_about.h\)' \ - | sort ; \ - echo "" ; \ - echo "# modules" ; \ - find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -name '*.ui' \ - | grep -v '\(\.moc\.\|gui/gtk2/\)' \ - | 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 ; \ - echo "#bindings" ; \ - find bindings -name '*.[chm]' -o -name '*.[ch]pp' \ - |sort ; \ - } > $(top_srcdir)/po/POTFILES.in - rm -f $(top_srcdir)/po/vlc.pot cd po && $(MAKE) POTFILES vlc.pot update-po -#cd po && $(MAKE) update-po ############################################################################### # Enforce Mac OS X deployment target environment variable