]> git.sesse.net Git - vlc/blobdiff - Makefile.am
Create a modules-like directory for libraries
[vlc] / Makefile.am
index 65a321e7ecc230a54378b95a8cd9030ebcd64734..5790052068d97cabce610aa9944ef5daddc64c23 100644 (file)
@@ -9,11 +9,11 @@ NULL =
 # 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
+#  - . 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) debian ipkg
+SUBDIRS = intl libs src modules po . mozilla bindings activex share m4 doc
+DIST_SUBDIRS = $(SUBDIRS)  ipkg
 
 EXTRA_DIST = \
        HACKING \
@@ -26,8 +26,9 @@ EXTRA_DIST = \
        toolbox \
        vlc-api.pl \
        vlc-config.in.in \
-       vlc.spec \
-       vlc.spec.mdk \
+       vlc.fedora.spec \
+       vlc.mandriva.spec \
+       vlc.altlinux.spec \
        vlc.win32.nsi.in \
        $(NULL)
 
@@ -39,18 +40,11 @@ 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 +80,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 +153,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 \
@@ -164,10 +197,15 @@ EXTRA_DIST += \
        extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.icns \
        extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.rsrc \
        extras/MacOSX/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt \
+       extras/MacOSX/plugin/Info.plist \
+       extras/MacOSX/plugin/InstallerInfo.plist \
+       extras/MacOSX/plugin/InstallerDescription.plist \
+       extras/MacOSX/plugin/pbdevelopment.plist \
+       extras/MacOSX/plugin/English.lproj/InfoPlist.strings \
        $(NULL)
 
 ###############################################################################
-# Various utilities ( editor syntax files, ... )
+# Various utilities ( editor syntax files, D-Bus controller ... )
 ##############################################################################
 EXTRA_DIST += \
        extras/Makefile \
@@ -176,6 +214,9 @@ EXTRA_DIST += \
        extras/vlc.vim \
        extras/make.pl \
        extras/valgrind.suppressions \
+       extras/m4/autoconf260.m4 \
+       extras/dbus-vlc.py \
+       extras/dbus-vlc.glade \
        $(NULL)
 
 ###############################################################################
@@ -210,9 +251,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
@@ -225,7 +268,7 @@ 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
@@ -240,17 +283,13 @@ vlc_LDADD = $(DATA_win32_rc) $(LIBVLC)
 
 vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 if USE_LIBTOOL
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc`
 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`
@@ -264,14 +303,15 @@ 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)
        @rm -f vlc$(EXEEXT)
@@ -311,10 +351,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
@@ -343,6 +384,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 \
@@ -385,24 +428,16 @@ 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 \
@@ -481,6 +516,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 \
@@ -523,24 +560,16 @@ 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 \
@@ -619,9 +648,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" ; \
@@ -644,12 +671,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/ ;
@@ -660,18 +691,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/ ;
 endif
 
 if BUILD_ACTIVEX
@@ -689,9 +721,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
@@ -757,7 +787,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 
@@ -779,7 +809,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}
 
@@ -812,7 +844,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 ;
 
@@ -823,7 +855,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
@@ -839,7 +871,11 @@ package-macosx:
        mkdir -p "$(top_builddir)/vlc-${VERSION}/";
 
 # Copy relevant files 
-       cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"
+       @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)" && 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}/
 
 # Create disk image 
@@ -856,7 +892,8 @@ package-macosx:
 
 package-macosx-plugin:
 if BUILD_MOZILLA
-       rm -rf "$(top_builddir)/macosx-plugin-instdata/"
+# Create Installer
+       rm -rf "$(top_builddir)/macosx-plugin-instdata/"; true
        mkdir -p "$(top_builddir)/macosx-plugin-instdata"
        cp -R "$(top_builddir)/mozilla/VLC Plugin.plugin" "$(top_builddir)/macosx-plugin-instdata"
        rm -rf "$(top_builddir)/VLC Internet Plug-In.pkg"
@@ -865,6 +902,17 @@ if BUILD_MOZILLA
        -i "$(srcdir)/extras/MacOSX/plugin/InstallerInfo.plist" \
        -d "$(srcdir)/extras/MacOSX/plugin/InstallerDescription.plist"; true
        rm -rf "$(top_builddir)/macosx-plugin-instdata/"
+
+# Create disk image 
+       rm -f "$(top_builddir)/vlc-plugin-${VERSION}.dmg"; true
+       rm -rf "$(top_builddir)/vlc-plugin-${VERSION}/"; true
+       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 \
+         -scrub -imagekey zlib-level=9 ;
+       echo "Disk image creation completed:"
+       rm -rf "$(top_builddir)/vlc-plugin-${VERSION}"
 endif
 
 package-translations:
@@ -903,7 +951,7 @@ 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" ; \
@@ -912,8 +960,9 @@ update-po:
            | 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