X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=fc50d1faafcb4e3f566a395723c66f5e879dd770;hb=29b25343f2dd7d38d2ba070b1ae86f00e36f403e;hp=a4a264131453c74d70fe61d60a40a5abc11672ee;hpb=1e5190c13885c64800d02075e310f30845a602b3;p=vlc diff --git a/Makefile.am b/Makefile.am index a4a2641314..fc50d1faaf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,18 +2,15 @@ # Automake targets and declarations ############################################################################### -NULL = - # 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. -# - intl should come before modules and . because all the code uses gettext -# - modules should come before . because vlc needs the builtins -# - . should come before mozilla/bindings because the plugin needs libvlc.a -# - po should come before . because VLC.app needs the pofiles -# - loader should come before modules because some plugins need it -SUBDIRS = intl loader src modules po . mozilla bindings activex share m4 doc -DIST_SUBDIRS = $(SUBDIRS) ipkg +# - intl (gettext) is needed by src and modules +# - src (libvlc) is nedeed by modules, mozilla and bindings +# - libs/* are needed by modules +SUBDIRS = intl po libs/loader libs/srtp src modules \ + mozilla bindings activex share doc +DIST_SUBDIRS = $(SUBDIRS) m4 ipkg EXTRA_DIST = \ HACKING \ @@ -22,18 +19,20 @@ EXTRA_DIST = \ vlc.exe.manifest \ MAINTAINERS \ README.MacOSX.rtf \ - bootstrap \ - toolbox \ - vlc-api.pl \ vlc-config.in.in \ vlc.fedora.spec \ vlc.mandriva.spec \ vlc.altlinux.spec \ - vlc.win32.nsi.in \ - $(NULL) + vlc.win32.nsi.in + +dist_noinst_SCRIPTS = bootstrap toolbox BUILT_SOURCES_distclean = vlc-config compile vlc.win32.nsi +if HAVE_DARWIN BUILT_SOURCES_clean = macosx-sdk +else +BUILT_SOURCES_clean = +endif BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean) @@ -188,7 +187,8 @@ EXTRA_DIST += \ extras/MacOSX/Resources/fs_exit_fullscreen.png \ extras/MacOSX/Resources/fs_background.png \ extras/MacOSX/fullscreen_panel.svg \ - extras/MacOSX/vlc.pbproj/project.pbxproj \ + extras/MacOSX/ub.sh \ + extras/MacOSX/vlc.xcodeproj/project.pbxproj \ extras/MacOSX/Delete_Preferences.app/Contents/Info.plist \ extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \ extras/MacOSX/Delete_Preferences.app/Contents/MacOS/applet \ @@ -200,8 +200,7 @@ EXTRA_DIST += \ extras/MacOSX/plugin/InstallerInfo.plist \ extras/MacOSX/plugin/InstallerDescription.plist \ extras/MacOSX/plugin/pbdevelopment.plist \ - extras/MacOSX/plugin/English.lproj/InfoPlist.strings \ - $(NULL) + extras/MacOSX/plugin/English.lproj/InfoPlist.strings ############################################################################### # Various utilities ( editor syntax files, D-Bus controller ... ) @@ -215,31 +214,9 @@ EXTRA_DIST += \ extras/valgrind.suppressions \ extras/m4/autoconf260.m4 \ extras/dbus-vlc.py \ - extras/dbus-vlc.glade \ - $(NULL) - -############################################################################### -# MS Visual Studio and eMbedded Visual Studio projects -############################################################################### - -EXTRA_DIST += \ - msvc/vlc.dsw \ - msvc/libvlc.dsp.in \ - msvc/plugins.dsp.in \ - msvc/vlc.dsp.in \ - msvc/config.h.in \ - msvc/modules_builtin_msvc.h \ - evc/vlc.vcw \ - evc/libvlc.vcp.in \ - evc/vlc.vcp.in \ - evc/plugins.vcp.in \ - evc/errno.h \ - evc/config.h.in \ - evc/modules_builtin_evc.h \ - $(NULL) + extras/dbus-vlc.glade dist-hook: - cd $(distdir) && srcdir=. $(SHELL) ./toolbox --update-vc distdir=$(distdir) srcdir=$(srcdir) $(SHELL) $(srcdir)/toolbox --dist-contrib ############################################################################### @@ -267,41 +244,19 @@ bin_PROGRAMS = vlc vlc_SOURCES = src/vlc.c # Ugly kludge so that automake defines $(CXXLINK) -nodist_EXTRA_vlc_SOURCES = extras/zsh.cpp misc/darwin_specific.m +nodist_EXTRA_vlc_SOURCES = extras/zsh.cpp src/misc/darwin_specific.m -# Work around a bug in the arm-wince-pe linker -if HAVE_WINCE -vlc_WORKAROUNDLDFLAGS = $(LIBVLC) -endif +vlc_DEPENDENCIES = $(LIBVLC) $(DATA_win32_rc) -# We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an -# old automake-1.5 bug (automake/279). -DEPENDENCIES_vlc = src/$(LIB_libvlc) $(DATA_win32_rc) - -vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) +vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL) +vlc_LDFLAGS = +if !HAVE_PLUGINS +vlc_LDFLAGS += `$(VLC_CONFIG) --target plugin | sed -e 's/\_plugin /_plugin.la /g'` +endif vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` -if USE_LIBTOOL LIB_libvlc = libvlc.la LIBVLC = src/$(LIB_libvlc) -vlc_LDFLAGS = -else -if BUILD_SHARED -vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` -Wl,-rpath $(libdir) -L$(top_builddir)/src -lvlc -if HAVE_WIN32 -LIB_libvlc = libvlc.dll.a -else -LIB_libvlc = libvlc$(LIBEXT) -endif -LIBVLC = -else -vlc_LDFLAGS = $(vlc_WORKAROUNDLFDLAGS) `$(VLC_CONFIG) --libs vlc builtin` -LIB_libvlc = libvlc.a -LIBVLC = src/$(LIB_libvlc) -DEPENDENCIES_vlc += stamp-builtin -endif -vlc_LDADD += $(INCLUDED_LIBINTL) -endif # Shortcut for developpers to rebuild the core (libvlc + vlc) # Don't use it if you don't know what it is about. @@ -316,7 +271,7 @@ core: libvlc src/$(LIB_libvlc): libvlc -vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) +vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES) @rm -f vlc$(EXEEXT) @case `$(VLC_CONFIG) --linkage vlc builtin` in \ c++) cmd="$(CXXLINK)" ;; \ @@ -355,9 +310,10 @@ endif # Install the symlinks install-exec-local: install-binPROGRAMS + inst="`echo vlc | sed -e '$(transform)'`" ; \ for i in "" $(ALIASES) ; do if test -n "$$i" ; then \ rm -f "$(DESTDIR)$(bindir)/$$i" && \ - ln -sf vlc "$(DESTDIR)$(bindir)/$$i" ; \ + ln -sf "$${inst}" "$(DESTDIR)$(bindir)/$$i" ; \ fi ; done # the opposite of install-{data,exec}-local @@ -436,29 +392,25 @@ VLC-release.app: vlc cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - case $(host_os) in \ - *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ - cd ../../../ && \ - cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ - $(top_builddir)/VLC-release.app;; \ - *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ - cd ../../../ && \ - cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ - $(top_builddir)/VLC-release.app;; \ - *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ + cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ cd ../../../ && \ cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \ - $(top_builddir)/VLC-release.app;; \ - esac + $(top_builddir)/VLC-release.app; \ rm -Rf $(top_builddir)/tmp $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS - $(INSTALL) $(top_builddir)/vlc \ + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/lib + $(INSTALL) $(top_builddir)/.libs/vlc \ $(top_builddir)/VLC-release.app/Contents/MacOS/VLC + $(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \ + $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc.dylib + install_name_tool -change /usr/local/lib/libvlc.1.dylib \ + @executable_path/lib/libvlc.dylib \ + $(top_builddir)/VLC-release.app/Contents/MacOS/VLC ln -sf ./VLC $(top_builddir)/VLC-release.app/Contents/MacOS/clivlc $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/modules - for i in "" `$(VLC_CONFIG) --target plugin` ; do \ + for i in `$(VLC_CONFIG) --target plugin` ; do \ if test -n "$$i" ; \ - then $(INSTALL) "$$i$(LIBEXT)" \ + then $(INSTALL) "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \ "$(top_builddir)/VLC-release.app/Contents/MacOS/modules" ; \ fi ; done if test -d $(srcdir)/extras/contrib/vlc-lib; then \ @@ -467,6 +419,14 @@ VLC-release.app: vlc $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/`basename $${i}` ; \ done ; \ fi + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist + for i in $(srcdir)/share/luaplaylist/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist/`basename $${i}` ; \ + done ; \ + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta + for i in $(srcdir)/share/luameta/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta/`basename $${i}` ; \ + done ; \ $(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 @@ -508,10 +468,10 @@ VLC-release.app: vlc $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ ln -sf ../English.lproj/MainMenu.nib \ $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ - ln -sf ../English.lproj/vlc.scriptTerminology \ - $(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 -type d -exec chmod ugo+rx '{}' \; + find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \; VLC.app: vlc @if test -e "$(top_builddir)/tmp"; then \ @@ -578,38 +538,38 @@ VLC.app: vlc cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - case $(host_os) in \ - *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'&& \ - cd ../../../ && \ - cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ - $(top_builddir)/VLC.app;; \ - *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'&& \ - cd ../../../ && \ - cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ - $(top_builddir)/VLC.app;; \ - *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ + cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ cd ../../../ && \ cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \ - $(top_builddir)/VLC.app;; \ - esac + $(top_builddir)/VLC.app; \ rm -Rf $(top_builddir)/tmp $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS - $(INSTALL) $(top_builddir)/vlc \ + $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/lib + $(INSTALL) $(top_builddir)/.libs/vlc \ $(top_builddir)/VLC.app/Contents/MacOS/VLC + $(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \ + $(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc.dylib + install_name_tool -change /usr/local/lib/libvlc.1.dylib \ + @executable_path/lib/libvlc.dylib \ + $(top_builddir)/VLC.app/Contents/MacOS/VLC ln -sf ./VLC $(top_builddir)/VLC.app/Contents/MacOS/clivlc $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules - for i in "" `$(VLC_CONFIG) --target plugin` ; do \ + for i in `$(VLC_CONFIG) --target plugin` ; do \ if test -n "$$i" ; \ - then ln -sfn "`pwd`/$$i$(LIBEXT)" \ + then install_name_tool -change /usr/local/lib/libvlc.1.dylib \ + @executable_path/lib/libvlc.dylib \ + "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)"; \ + ln -sfn "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \ "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \ fi ; done if test -d $(srcdir)/extras/contrib/vlc-lib; then \ mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/lib ; \ for i in $(srcdir)/extras/contrib/vlc-lib/*.dylib ; do \ + install_name_tool -change /usr/local/lib/libvlc.1.dylib @executable_path/lib/libvlc.dylib $${i}; \ ln -sfn `pwd`/$${i} $(top_builddir)/VLC.app/Contents/MacOS/lib/`basename $${i}` ; \ done ; \ fi - ln -sfn `pwd`/share $(top_builddir)/VLC.app/Contents/MacOS/ + ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/ $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale for i in $(ALL_LINGUAS); do \ mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ @@ -668,11 +628,10 @@ package-win-common: fi # Copy relevant files - cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/" + cp "$(top_builddir)/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/" cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/" -if BUILD_SHARED - cp "src/libvlc$(LIBEXT)" "vlc-${VERSION}/" -endif + cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-${VERSION}/" + cp "$(top_builddir)/src/.libs/libvlc-control$(LIBEXT)" "vlc-${VERSION}/" for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \ do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \ @@ -695,12 +654,16 @@ endif mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/admin" cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ; + cp $(srcdir)/share/http/.hosts $(top_builddir)/vlc-${VERSION}/http/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/.hosts ; cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ; cp $(srcdir)/share/http/js/*.js $(top_builddir)/vlc-${VERSION}/http/js/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/js/*.js ; cp $(srcdir)/share/http/dialogs/* $(top_builddir)/vlc-${VERSION}/http/dialogs/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/* ; + cp $(srcdir)/share/http/dialogs/.hosts $(top_builddir)/vlc-${VERSION}/http/dialogs/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/.hosts ; cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ; cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-${VERSION}/http/images/ cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ; @@ -711,17 +674,19 @@ endif cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-${VERSION}/http/old/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/old/*.html ; cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-${VERSION}/http/old/ ; + cp $(srcdir)/share/http/old/.hosts $(top_builddir)/vlc-${VERSION}/http/old/ ; cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-${VERSION}/http/old/ ; cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http/old/vlm/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/old/vlm/*.html ; cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-${VERSION}/http/old/admin/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/old/admin/*.html ; + cp $(srcdir)/share/http/old/admin/.access $(top_builddir)/vlc-${VERSION}/http/old/admin/ ; cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ; if BUILD_MOZILLA mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla" - cp $(top_builddir)/mozilla/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ; + cp $(top_builddir)/mozilla/.libs/npvlc$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ; endif if BUILD_ACTIVEX @@ -730,7 +695,7 @@ if BUILD_ACTIVEX cp $(srcdir)/activex/test.html $(top_builddir)/vlc-${VERSION}/activex/ ; unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ; - cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ; + cp $(top_builddir)/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ; endif # Rebase all those DLLs to speed up loading (need cygwin rebase) if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \ @@ -739,14 +704,13 @@ endif package-win-common-strip: $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)" -if BUILD_SHARED $(STRIP) "vlc-${VERSION}/libvlc$(LIBEXT)" -endif + $(STRIP) "vlc-${VERSION}/libvlc-control$(LIBEXT)" if BUILD_MOZILLA - $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT); + $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/npvlc$(LIBEXT); endif if BUILD_ACTIVEX - $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT); + $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/axvlc$(LIBEXT); endif package-win32-base-debug: package-win-common @@ -756,7 +720,7 @@ package-win32-base-debug: package-win-common mkdir -p "$(top_builddir)/vlc-${VERSION}/plugins" for i in "" `$(VLC_CONFIG) --target plugin` ; do \ if test -n "$$i" ; then \ - $(INSTALL) "$(top_builddir)/$$i$(LIBEXT)" \ + $(INSTALL) "$(top_builddir)/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \ "$(top_builddir)/vlc-${VERSION}/plugins/" ; \ fi ; done @@ -768,6 +732,15 @@ package-win32-base-debug: package-win-common cp $$i $(top_builddir)/vlc-${VERSION}/skins/ || true ; \ done + $(INSTALL) -d $(top_builddir)/vlc-${VERSION}/share/luaplaylist + for i in $(srcdir)/share/luaplaylist/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luaplaylist/`basename $${i}` ; \ + done ; + $(INSTALL) -d $(top_builddir)/vlc-${VERSION}/share/luameta + for i in $(srcdir)/share/luameta/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luameta/`basename $${i}` ; \ + done ; + 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;do \ @@ -829,7 +802,9 @@ package-win32-7zip: package-win32-base-7zip # Clean up rm -Rf $(top_builddir)/vlc-${VERSION} -package-win32: package-win32-base-exe package-win32-base-zip +package-win32-no-clean: package-win32-base-exe package-win32-base-zip package-win32-base-7zip + +package-win32: package-win32-no-clean # Clean up rm -Rf $(top_builddir)/vlc-${VERSION} @@ -894,14 +869,76 @@ package-macosx: else \ cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \ fi - cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/vlc-${VERSION}/ && cp -R extras/MacOSX/Delete_Preferences.app $(top_builddir)/vlc-${VERSION}/ + cd "$(srcdir)" && 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/MacOSX/Delete_Preferences.app $(top_builddir)/vlc-${VERSION}/Goodies/Delete\ VLC\ Preferences.app && \ + cp README.MacOSX.rtf $(top_builddir)/vlc-${VERSION}/Read\ Me.rtf && \ + cp extras/MacOSX/Resources/about_bg.png $(top_builddir)/vlc-${VERSION}/.background/background.png ; + +# Place a link to the application folder + ln -s /Applications $(top_builddir)/vlc-${VERSION}/Applications ; # Create disk image echo "Creating disk image" ; rm -f "$(top_builddir)/vlc-${VERSION}.dmg" ; hdiutil create -srcfolder "$(top_builddir)/vlc-${VERSION}" \ - "$(top_builddir)/vlc-${VERSION}.dmg" -format UDZO \ + "$(top_builddir)/vlc-${VERSION}.dmg" -format UDRW \ -scrub -imagekey zlib-level=9 ; + +# Make sure the root window of the dmg will pop up when the dmg is mounted. +# Note: We dont mount in /Volumes to be sure we won't collide with an other +# finder mounted dmg with the same name. + echo "Make sure the root window of the dmg will pop up when the dmg is mounted" ; + mkdir -p $(top_builddir)/vlcmnt ; + hdiutil attach -readwrite -noverify -noautoopen "$(top_builddir)/vlc-${VERSION}.dmg" -mountpoint "$(top_builddir)/vlcmnt/vlc-${VERSION}" ; + bless --folder "$(top_builddir)/vlcmnt/vlc-${VERSION}/" --openfolder "$(top_builddir)/vlcmnt/vlc-${VERSION}" ; + sleep 1 # Make sure operation completes + +# Place the image disk finder icon at the correct place +# Note: careful here the finder does some weird things +# sometimes. delays in the script should prevent those. + cd "$(srcdir)" + osascript -e "tell application \"Finder\"" \ + -e " set f to POSIX file (\"$(top_builddir)/vlcmnt/vlc-${VERSION}/\" as string) as alias" \ + -e " tell folder f" \ + -e " open" \ + -e " tell container window" \ + -e " set toolbar visible to false" \ + -e " set statusbar visible to false" \ + -e " set current view to icon view" \ + -e " delay 1 -- Sync" \ + -e " set the bounds to {50, 100, 1000, 1000} -- Big size so the finder won't do silly things" \ + -e " end tell" \ + -e " delay 1 -- Sync" \ + -e " set icon size of the icon view options of container window to 128" \ + -e " set arrangement of the icon view options of container window to not arranged" \ + -e " set background picture of the icon view options of container window to file \".background:background.png\"" \ + -e " set position of item \"VLC.app\" to {100, 20}" \ + -e " set position of item \"Applications\" to {310, 20}" \ + -e " set position of item \"Goodies\" to {40, 200}" \ + -e " set position of item \"Read Me.rtf\" to {410, 200}" \ + -e " set the bounds of the container window to {50, 100, 590, 500}" \ + -e " update without registering applications" \ + -e " delay 5 -- Sync" \ + -e " close" \ + -e " end tell" \ + -e " -- Sync" \ + -e " delay 5" \ + -e "end tell" || true # Make sure we don't make the build bots fail + +# Unmount the image now + hdiutil detach "$(top_builddir)/vlcmnt/vlc-${VERSION}" ; + rm -R $(top_builddir)/vlcmnt ; + +# Make sure the image is not writable +# 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" ; + rm "$(top_builddir)/vlc-${VERSION}-rw.dmg" ; + +# We are done echo "Disk image creation completed:" ; ls -la "$(top_builddir)/vlc-${VERSION}.dmg" ; echo ; @@ -974,7 +1011,7 @@ update-po: echo "" ; \ echo "# main sources" ; \ find include src -name '*.[chm]' -o -name '*.[ch]pp' \ - | grep -v '\(vlc_symbols\|misc/modules_\|src/misc/version.c\)' \ + | grep -v '\(misc/modules_\|src/misc/revision.c\|modules/builtin.h\)' \ | sort ; \ echo "" ; \ echo "# modules" ; \ @@ -991,22 +1028,18 @@ update-po: ############################################################################### # Stamp rules ############################################################################### -stamp-builtin: FORCE - @for dep in "" `$(VLC_CONFIG) --target builtin`; do \ - if test "$${dep}" -nt "$(top_builddir)/vlc$(EXEEXT)"; then \ - rm -f $@; \ +stamp-builtin: + @for dep in "" `$(VLC_CONFIG) --target plugin`; do \ + if test "$${dep}.la" -nt "$(top_builddir)/vlc$(EXEEXT)"; then \ + touch "$@"; \ break; \ fi; \ done - @if test ! -f $@; then printf "" > $@; fi + +.PHONY: stamp-builtin ############################################################################### # Enforce Mac OS X deployment target environment variable ############################################################################### -macosx-sdk: Makefile.in $(HEADERS_include) vlc-config vlc-api.pl +macosx-sdk: Makefile.in $(HEADERS_include) vlc-config export MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET) - -############################################################################### -# Force rule -############################################################################### -FORCE: