]> git.sesse.net Git - vlc/blobdiff - Makefile.am
stream_filter: smooth: fix leak (cid #1211818)
[vlc] / Makefile.am
index ff0f1f575ba72825a4356004d9d81b8352a3728a..7efa5457d4a3214dbf77ef3108d8c98a57e33d87 100644 (file)
@@ -16,7 +16,6 @@ SUBDIRS += test
 EXTRA_DIST = \
        extras/package/win32/vlc.exe.manifest \
        extras/package/win32/libvlc.dll.manifest \
-       extras/package/win32/peflags.pl \
        extras/package/win32/change-contribs-directory.sh \
        extras/package/win32/configure.sh \
        extras/package/symbian/configure.sh \
@@ -83,6 +82,7 @@ SUFFIXES =
 DISTCHECK_CONFIGURE_FLAGS = \
        --enable-fast-install \
        --disable-a52 \
+       --disable-alsa \
        --disable-avcodec --disable-avformat \
        --disable-postproc --disable-swscale \
        --disable-dbus \
@@ -106,7 +106,7 @@ AUTOMAKE_OPTIONS = \
 ChangeLog: Makefile.am
        rm -f -- "$@"
        cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs
-       $(LN_S) -f doc/ChangeLog-2013 "$@"
+       $(LN_S) -f doc/ChangeLog-2014 "$@"
 
 ###############################################################################
 # Mac OS X project
@@ -118,16 +118,22 @@ EXTRA_DIST += \
        extras/package/macosx/VLC.entitlements \
        extras/package/macosx/Resources/dsa_pub.pem \
        extras/package/macosx/Resources/English.lproj/About.xib \
+       extras/package/macosx/Resources/English.lproj/AddonManager.xib \
        extras/package/macosx/Resources/English.lproj/AudioEffects.xib \
        extras/package/macosx/Resources/English.lproj/Bookmarks.xib \
        extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib \
        extras/package/macosx/Resources/English.lproj/CoreDialogs.xib \
+       extras/package/macosx/Resources/English.lproj/DebugMessageVisualizer.xib \
        extras/package/macosx/Resources/English.lproj/DetachedVideoWindow.xib \
        extras/package/macosx/Resources/English.lproj/ErrorPanel.xib \
+       extras/package/macosx/Resources/English.lproj/FSPanel.xib \
        extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \
        extras/package/macosx/Resources/English.lproj/MainMenu.xib \
+       extras/package/macosx/Resources/English.lproj/MainWindow.xib \
        extras/package/macosx/Resources/English.lproj/MediaInfo.xib \
        extras/package/macosx/Resources/English.lproj/Open.xib \
+       extras/package/macosx/Resources/English.lproj/PlaylistAccessoryView.xib \
+       extras/package/macosx/Resources/English.lproj/PlaylistMenu.xib \
        extras/package/macosx/Resources/English.lproj/Preferences.xib \
        extras/package/macosx/Resources/English.lproj/SharedDialogs.xib \
        extras/package/macosx/Resources/English.lproj/SyncTracks.xib \
@@ -541,13 +547,6 @@ EXTRA_DIST += \
        extras/package/macosx/configure.sh \
        extras/package/macosx/dmg_setup.scpt \
        extras/package/macosx/vlc.xcodeproj/project.pbxproj \
-       extras/package/macosx/Delete_Preferences.app/Contents/Info.plist \
-       extras/package/macosx/Delete_Preferences.app/Contents/PkgInfo \
-       extras/package/macosx/Delete_Preferences.app/Contents/MacOS/applet \
-       extras/package/macosx/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf \
-       extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.icns \
-       extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.rsrc \
-       extras/package/macosx/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt \
        extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \
        extras/package/macosx/eyetvplugin/Info.plist \
        extras/package/macosx/eyetvplugin/eyetvplugin.c \
@@ -676,10 +675,6 @@ install-exec-hook:
 uninstall-hook:
        rm -f -- "$(DESTDIR)$(vlclibdir)/plugins/plugins.dat"
 
-silentstd = $(silentstd_$(V))
-silentstd_ = $(silentstd_$(AM_DEFAULT_VERBOSITY))
-silentstd_0 = 2>&1 >/dev/null
-
 ###############################################################################
 # PO translation files update
 ###############################################################################