# 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
+makesilentflags__0 = $(makesilentflags_0)
+
# 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 bin 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/unzip \
projects/mozilla projects/activex
DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
-SUBDIRS = po src
+SUBDIRS = po compat src
if LOADER
SUBDIRS += libs/loader
endif
--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
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 \
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 \
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 \
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:
+libcompat:
+ cd compat && $(MAKE) $(AM_MAKEFLAGS)
+
+libvlc: libcompat
cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
core: libvlc
# Building aliases
###############################################################################
-ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc mvlc
+ALL_ALIASES = cvlc rvlc svlc qvlc nvlc mvlc
bin_SCRIPTS = $(ALIASES)
CLEANFILES += $(ALIASES) $(noinst_SCRIPTS)
EXTRA_SCRIPTS = $(ALL_ALIASES)
svlc: make-alias Makefile
$(MKALIAS) skins2
-wxvlc: make-alias Makefile
- $(MKALIAS) wx
-
qvlc: make-alias Makefile
$(MKALIAS) qt4
noinst_SCRIPTS += vlc$(EXEEXT)
endif
-vlc$(EXEEXT): Makefile.am
- rm -f -- vlc vlc.tmp
- echo '#! /bin/sh' > vlc.tmp
- echo 'exec "$$(dirname "$$0")/bin/vlc-static$(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
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 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 \
extended.m \
bookmarks.h \
bookmarks.m \
- update.h \
- update.m \
- interaction.h \
- interaction.m \
+ coredialogs.h \
+ coredialogs.m \
embeddedwindow.h \
embeddedwindow.m \
fspanel.h \
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
PRODUCT="VLC-release.app" ACTION="release-makefile" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
$(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
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
$(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/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.
+# 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
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 \
extended.m \
bookmarks.h \
bookmarks.m \
- update.h \
- update.m \
- interaction.h \
- interaction.m \
+ coredialogs.h \
+ coredialogs.m \
embeddedwindow.h \
embeddedwindow.m \
fspanel.h \
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
+ $(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
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)/
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
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
for i in "" vlc-$(VERSION)/*$(LIBEXT) ; \
do if test -n "$$i" ; then \
$(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \
- $(OBJCOPY) --strip-debug "$$i" ; \
+ $(OBJCOPY) --strip-all "$$i" ; \
$(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \
mv "$$i.dbg" "$(win32_debugdir)"; \
fi; done
-if BUILD_MOZILLA
- $(OBJCOPY) --only-keep-debug "$(npvlc)" "$(npvlc).dbg"
- $(OBJCOPY) --strip-debug "$(npvlc)"
- $(OBJCOPY) --add-gnu-debuglink="$(npvlc).dbg" "$(npvlc)"
- mv "$(npvlc).dbg" "$(win32_debugdir)"
-endif
-if BUILD_ACTIVEX
- $(OBJCOPY) --only-keep-debug "$(axvlc)" "$(axvlc).dbg"
- $(OBJCOPY) --strip-debug "$(axvlc)"
- $(OBJCOPY) --add-gnu-debuglink="$(axvlc).dbg" "$(axvlc)"
- mv "$(axvlc).dbg" "$(win32_debugdir)"
-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 \
$(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \
- $(OBJCOPY) --strip-debug "$$i" ; \
+ $(OBJCOPY) --strip-all "$$i" ; \
$(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \
mv "$$i.dbg" "$(win32_debugdir)"; \
fi ; done
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
# 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
# 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=
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
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)"
###############################################################################
# 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 ; \
- } > $(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