X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=929fabe7aeecd6033b72895e0eddd07058ba0db3;hb=0f182a175a38aebb130e3e3b3e9f8a4dcff90f68;hp=11807c368d71990d15fe5910b42e40a30a5319b4;hpb=f0f2eefeb04463f52d6ec23c3abae41f06041ccb;p=vlc diff --git a/Makefile.am b/Makefile.am index 11807c368d..929fabe7ae 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 \ @@ -29,8 +26,7 @@ EXTRA_DIST = \ vlc.fedora.spec \ vlc.mandriva.spec \ vlc.altlinux.spec \ - vlc.win32.nsi.in \ - $(NULL) + vlc.win32.nsi.in BUILT_SOURCES_distclean = vlc-config compile vlc.win32.nsi BUILT_SOURCES_clean = macosx-sdk @@ -188,7 +184,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 +197,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,8 +211,7 @@ EXTRA_DIST += \ extras/valgrind.suppressions \ extras/m4/autoconf260.m4 \ extras/dbus-vlc.py \ - extras/dbus-vlc.glade \ - $(NULL) + extras/dbus-vlc.glade ############################################################################### # MS Visual Studio and eMbedded Visual Studio projects @@ -235,8 +230,7 @@ EXTRA_DIST += \ evc/plugins.vcp.in \ evc/errno.h \ evc/config.h.in \ - evc/modules_builtin_evc.h \ - $(NULL) + evc/modules_builtin_evc.h dist-hook: cd $(distdir) && srcdir=. $(SHELL) ./toolbox --update-vc @@ -267,16 +261,14 @@ bin_PROGRAMS = vlc vlc_SOURCES = src/vlc.c # Ugly kludge so that automake defines $(CXXLINK) -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 -# 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_DEPENDENCIES = src/$(LIB_libvlc) $(DATA_win32_rc) vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) @@ -286,19 +278,15 @@ 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 +vlc_LDFLAGS = -L$(top_builddir)/src -lvlc `$(VLC_CONFIG) --libs vlc` 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 +vlc_DEPENDENCIES += stamp-builtin endif vlc_LDADD += $(INCLUDED_LIBINTL) endif @@ -316,7 +304,7 @@ core: libvlc src/$(LIB_libvlc): libvlc -vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) +vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_DEPENDENCIES) @rm -f vlc$(EXEEXT) @case `$(VLC_CONFIG) --linkage vlc builtin` in \ c++) cmd="$(CXXLINK)" ;; \ @@ -355,9 +343,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,20 +425,10 @@ 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 \ @@ -467,6 +446,10 @@ 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/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 +491,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,20 +561,10 @@ 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 \ @@ -670,9 +643,7 @@ package-win-common: # Copy relevant files cp "$(top_builddir)/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 for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \ do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \ @@ -695,12 +666,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,11 +686,13 @@ 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}/ ; @@ -739,9 +716,7 @@ endif package-win-common-strip: $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)" -if BUILD_SHARED $(STRIP) "vlc-${VERSION}/libvlc$(LIBEXT)" -endif if BUILD_MOZILLA $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT); endif @@ -829,7 +804,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 +871,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 +1013,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 '\(vlc_symbols\|misc/modules_\|src/misc/revision.c\|modules/builtin.h\)' \ | sort ; \ echo "" ; \ echo "# modules" ; \