X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=d51d15c68a017b555028be4206aa0fedcf403375;hb=24f3597e3481b4a89ba8f7de1fe73414924b4542;hp=3932f9c7e8e99bdfbaf501435372da4e41732c16;hpb=f1269968c95765cc449900cb5594db5d388d6886;p=vlc diff --git a/Makefile.am b/Makefile.am index 3932f9c7e8..d51d15c68a 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_pic.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 \ @@ -24,33 +21,29 @@ EXTRA_DIST = \ README.MacOSX.rtf \ bootstrap \ toolbox \ - vlc-api.pl \ vlc-config.in.in \ - vlc.spec \ - vlc.spec.mdk \ - vlc.win32.nsi.in \ - $(NULL) + vlc.fedora.spec \ + vlc.mandriva.spec \ + vlc.altlinux.spec \ + vlc.win32.nsi.in 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) SUFFIXES = DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \ - --disable-ffmpeg --disable-faad --disable-skins2 -if USE_LIBTOOL -DISTCHECK_CONFIGURE_FLAGS += --enable-libtool -endif + --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 # Tell aclocal to use -I m4. Wonder if it really works. ACLOCAL_AMFLAGS = -I m4 -# XXX: these flags could be set in configure.ac, but we set them here -# because old versions of automake don't support them in configure.ac. -AUTOMAKE_OPTIONS = dist-bzip2 - ############################################################################### # MacOS X project ############################################################################### @@ -86,6 +79,9 @@ EXTRA_DIST += \ extras/MacOSX/Resources/English.lproj/Interaction.nib/classes.nib \ extras/MacOSX/Resources/English.lproj/Interaction.nib/info.nib \ extras/MacOSX/Resources/English.lproj/Interaction.nib/keyedobjects.nib \ + extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib \ + extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/info.nib \ + extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib \ extras/MacOSX/Resources/English.lproj/InfoPlist.strings \ extras/MacOSX/Resources/a52.icns \ extras/MacOSX/Resources/aac.icns \ @@ -156,7 +152,43 @@ EXTRA_DIST += \ extras/MacOSX/Resources/vlc.scriptSuite \ extras/MacOSX/Resources/vlc.scriptTerminology \ extras/MacOSX/Resources/README \ - extras/MacOSX/vlc.pbproj/project.pbxproj \ + extras/MacOSX/Resources/add_embedded.png \ + extras/MacOSX/Resources/add_embedded_blue.png \ + extras/MacOSX/Resources/repeat_embedded.png \ + extras/MacOSX/Resources/repeat_embedded_blue.png \ + extras/MacOSX/Resources/repeat_single_embedded_blue.png \ + extras/MacOSX/Resources/shuffle_embedded.png \ + extras/MacOSX/Resources/shuffle_embedded_blue.png \ + extras/MacOSX/Resources/fs_volume_slider_knob_highlight.png \ + extras/MacOSX/Resources/fs_volume_slider_knob.png \ + extras/MacOSX/Resources/fs_volume_slider_bar.png \ + extras/MacOSX/Resources/fs_volume_mute_highlight.png \ + extras/MacOSX/Resources/fs_volume_mute.png \ + extras/MacOSX/Resources/fs_volume_max_highlight.png \ + extras/MacOSX/Resources/fs_volume_max.png \ + extras/MacOSX/Resources/fs_time_slider_knob_highlight.png \ + extras/MacOSX/Resources/fs_time_slider_knob.png \ + extras/MacOSX/Resources/fs_time_slider.png \ + extras/MacOSX/Resources/fs_stop_highlight.png \ + extras/MacOSX/Resources/fs_stop.png \ + extras/MacOSX/Resources/fs_skip_previous_highlight.png \ + extras/MacOSX/Resources/fs_skip_previous.png \ + extras/MacOSX/Resources/fs_skip_next_highlight.png \ + extras/MacOSX/Resources/fs_skip_next.png \ + extras/MacOSX/Resources/fs_rewind_highlight.png \ + extras/MacOSX/Resources/fs_rewind.png \ + extras/MacOSX/Resources/fs_play_highlight.png \ + extras/MacOSX/Resources/fs_play.png \ + extras/MacOSX/Resources/fs_pause_highlight.png \ + extras/MacOSX/Resources/fs_pause.png \ + extras/MacOSX/Resources/fs_forward_highlight.png \ + extras/MacOSX/Resources/fs_forward.png \ + extras/MacOSX/Resources/fs_exit_fullscreen_highlight.png \ + extras/MacOSX/Resources/fs_exit_fullscreen.png \ + extras/MacOSX/Resources/fs_background.png \ + extras/MacOSX/fullscreen_panel.svg \ + 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 \ @@ -168,11 +200,10 @@ 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, ... ) +# Various utilities ( editor syntax files, D-Bus controller ... ) ############################################################################## EXTRA_DIST += \ extras/Makefile \ @@ -181,30 +212,11 @@ EXTRA_DIST += \ extras/vlc.vim \ extras/make.pl \ extras/valgrind.suppressions \ - $(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/m4/autoconf260.m4 \ + extras/dbus-vlc.py \ + extras/dbus-vlc.glade dist-hook: - cd $(distdir) && srcdir=. $(SHELL) ./toolbox --update-vc distdir=$(distdir) srcdir=$(srcdir) $(SHELL) $(srcdir)/toolbox --dist-contrib ############################################################################### @@ -215,9 +227,11 @@ bin_SCRIPTS = vlc-config vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in $(SHELL) ./config.status --file=$@ chmod 0755 $@ + touch $@ vlc-config.in: vlc-config.in.in ./config.status --recheck + touch $@ CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile @@ -230,62 +244,42 @@ bin_PROGRAMS = vlc vlc_SOURCES = src/vlc.c # Ugly kludge so that automake defines $(CXXLINK) -EXTRA_vlc_SOURCES = extras/zsh.cpp +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 = $(LIBVLC) $(DATA_win32_rc) -vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) +vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL) vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` -if USE_LIBTOOL -vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` LIB_libvlc = libvlc.la LIBVLC = src/$(LIB_libvlc) -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. # Don't complain if it doesn't work. -- Courmisch -core: - rm -f src/$(LIB_libvlc) +libvlc: + cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc) + +core: libvlc $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) -.PHONY: core +.PHONY: libvlc core -src/$(LIB_libvlc): - cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_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)" ;; \ objc) cmd="$(OBJCLINK)" ;; \ c|*) cmd="$(LINK)" ;; \ esac ; \ - cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \ + cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD)" ; \ echo $$cmd ; \ eval $$cmd @@ -316,10 +310,11 @@ vlc-bundle: vlc endif # Install the symlinks -install-exec-local: +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 @@ -348,6 +343,8 @@ VLC-release.app: vlc mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/gui/macosx for i in \ + AppleRemote.h \ + AppleRemote.m \ about.h \ about.m \ applescript.h \ @@ -390,33 +387,31 @@ VLC-release.app: vlc interaction.m \ embeddedwindow.h \ embeddedwindow.m \ + fspanel.h \ + fspanel.m \ vout.m; do \ cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - case $(target_triplet) 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 ../../../; \ + 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 \ @@ -425,6 +420,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 @@ -466,10 +465,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 \ @@ -486,6 +485,8 @@ VLC.app: vlc mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/gui/macosx for i in \ + AppleRemote.h \ + AppleRemote.m \ about.h \ about.m \ applescript.h \ @@ -528,38 +529,40 @@ VLC.app: vlc interaction.m \ embeddedwindow.h \ embeddedwindow.m \ + fspanel.h \ + fspanel.m \ vout.m; do \ cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - case $(target_triplet) 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 ../../../; \ + 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 @@ -622,11 +625,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" ; \ @@ -649,12 +651,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/ ; @@ -665,18 +671,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/vlcintf.xpt $(top_builddir)/vlc-${VERSION}/mozilla/ ; + cp $(top_builddir)/mozilla/.libs/npvlc$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ; endif if BUILD_ACTIVEX @@ -685,7 +692,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 \ @@ -694,14 +701,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 @@ -711,7 +717,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 @@ -723,6 +729,11 @@ 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 ; \ + 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 \ @@ -762,7 +773,7 @@ package-win32-base-exe-linux: package-win32-base-zip: package-win32-base # Create package - zip -r vlc-${VERSION}-win32.zip vlc-${VERSION} + zip -r -9 vlc-${VERSION}-win32.zip vlc-${VERSION} package-win32-base-7zip: package-win32-base # Create package @@ -784,7 +795,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} @@ -817,7 +830,7 @@ package-beos: xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ; find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ; mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ; - (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} ) + (cd $(srcdir)/tmp && zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} ) mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/ ; mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc ; @@ -828,7 +841,7 @@ package-beos: xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ; find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ; mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ; - (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} ) + (cd $(srcdir)/tmp && zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} ) mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/ ; # Clean up @@ -844,15 +857,81 @@ package-macosx: mkdir -p "$(top_builddir)/vlc-${VERSION}/"; # Copy relevant files - cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app" - 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}/ + @if test -e "$(top_builddir)/VLC-release.app/"; then \ + cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \ + 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}/.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 ; @@ -920,17 +999,18 @@ package-translations: update-po: rm -f $(top_srcdir)/po/POTFILES.in { \ - cd $(top_srcdir) ; \ + 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 '\(vlc_symbols\|misc/modules_\|src/misc/version.c\)' \ + | grep -v '\(misc/modules_\|src/misc/revision.c\|modules/builtin.h\)' \ | sort ; \ echo "" ; \ echo "# modules" ; \ - find modules -name '*.[chm]' -o -name '*.[ch]pp' \ + find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -wholename 'modules/gui/qt4/ui/*.ui'\ | grep -v '\(\.moc\.\|gui/gtk2/\)' \ + | grep -vE 'qt4/ui/.*.h' |grep -v qt4/resources.cpp \ | sort ; \ } > $(top_srcdir)/po/POTFILES.in rm -f $(top_srcdir)/po/vlc.pot @@ -953,7 +1033,7 @@ stamp-builtin: FORCE ############################################################################### # 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) ###############################################################################