X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=7efa5457d4a3214dbf77ef3108d8c98a57e33d87;hb=b549a2f66996004c8e77ce75c8ecb0307f254880;hp=08a4847713291449ab16908ba6d69e05a8ace7e1;hpb=fccc6ab913cad66c50b98d1ac14d2fe1f41f7453;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 08a4847713..7efa5457d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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,12 +82,14 @@ SUFFIXES =
 DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-fast-install \
 	--disable-a52 \
+	--disable-alsa \
 	--disable-avcodec --disable-avformat \
 	--disable-postproc --disable-swscale \
 	--disable-dbus \
 	--disable-mad --disable-libmpeg2 \
 	--disable-faad --disable-skins2 \
 	--disable-live555 \
+	--disable-lua \
 	--disable-fribidi --disable-glx \
 	--disable-mkv \
 	--with-kde-solid='$${datadir}/kde4/apps'
@@ -105,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
@@ -117,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 \
@@ -540,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 \
@@ -675,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
 ###############################################################################
@@ -692,4 +688,5 @@ update-po:
 ###############################################################################
 include extras/package/macosx/package.mak
 include extras/package/win32/package.mak
+include extras/package/win32/msi.mak