X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=0d169cdf38eb203bc6819142ab8bb986825a1009;hb=f3b30afc36fb9bac57a485f33c9c53b711e9e9ae;hp=6d4f47667b42888c6e3834e36e91de9c00d51a18;hpb=b995c7405e4580cbdc8c93e056c1561f3158e1ef;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 6d4f47667b..0d169cdf38 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,44 +16,59 @@ 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 \
 	extras/package/npapi.am \
-	extras/package/win32/vlc.win32.nsi.in \
-	extras/package/win32/spad.nsi.in \
-	extras/package/win32/UAC.nsh \
-	extras/package/win32/languages/declaration.nsh \
-	extras/package/win32/languages/bengali.nsh \
-	extras/package/win32/languages/basque.nsh \
-	extras/package/win32/languages/brazilian_portuguese.nsh \
-	extras/package/win32/languages/bulgarian.nsh \
-	extras/package/win32/languages/catalan.nsh \
-	extras/package/win32/languages/danish.nsh \
-	extras/package/win32/languages/dutch.nsh \
-	extras/package/win32/languages/english.nsh \
-	extras/package/win32/languages/estonian.nsh \
-	extras/package/win32/languages/finnish.nsh \
-	extras/package/win32/languages/french.nsh \
-	extras/package/win32/languages/galician.nsh \
-	extras/package/win32/languages/german.nsh \
-	extras/package/win32/languages/hebrew.nsh \
-	extras/package/win32/languages/hungarian.nsh \
-	extras/package/win32/languages/italian.nsh \
-	extras/package/win32/languages/japanese.nsh \
-	extras/package/win32/languages/lithuanian.nsh \
-	extras/package/win32/languages/occitan.nsh \
-	extras/package/win32/languages/polish.nsh \
-	extras/package/win32/languages/punjabi.nsh \
-	extras/package/win32/languages/russian.nsh
-	extras/package/win32/languages/romanian.nsh \
-	extras/package/win32/languages/schinese.nsh \
-	extras/package/win32/languages/slovak.nsh \
-	extras/package/win32/languages/slovenian.nsh \
-	extras/package/win32/languages/sorani.nsh \
-	extras/package/win32/languages/spanish.nsh \
-	extras/package/win32/languages/swedish.nsh
+	extras/package/win32/NSIS/vlc.win32.nsi.in \
+	extras/package/win32/NSIS/spad.nsi.in \
+	extras/package/win32/NSIS/UAC/examples \
+	extras/package/win32/NSIS/UAC/examples/UAC_AllowLUA.nsi \
+	extras/package/win32/NSIS/UAC/examples/UAC_AdminOnly.nsi \
+	extras/package/win32/NSIS/UAC/examples/UAC_Uninstaller.nsi \
+	extras/package/win32/NSIS/UAC/examples/UAC.nsh \
+	extras/package/win32/NSIS/UAC/examples/UAC_GetUserShellFolderPath.nsi \
+	extras/package/win32/NSIS/UAC/examples/UAC_RealWorldFullyLoadedDualModeExample.nsi \
+	extras/package/win32/NSIS/UAC/History.txt \
+	extras/package/win32/NSIS/UAC/License.txt \
+	extras/package/win32/NSIS/UAC/nsisutil.h \
+	extras/package/win32/NSIS/UAC/resource.h \
+	extras/package/win32/NSIS/UAC/resource.rc \
+	extras/package/win32/NSIS/UAC/runas.cpp \
+	extras/package/win32/NSIS/UAC/uac.cpp \
+	extras/package/win32/NSIS/UAC/uac.h \
+	extras/package/win32/NSIS/UAC/Readme.html \
+	extras/package/win32/NSIS/UAC.nsh \
+	extras/package/win32/NSIS/languages/declaration.nsh \
+	extras/package/win32/NSIS/languages/bengali.nsh \
+	extras/package/win32/NSIS/languages/basque.nsh \
+	extras/package/win32/NSIS/languages/brazilian_portuguese.nsh \
+	extras/package/win32/NSIS/languages/bulgarian.nsh \
+	extras/package/win32/NSIS/languages/catalan.nsh \
+	extras/package/win32/NSIS/languages/danish.nsh \
+	extras/package/win32/NSIS/languages/dutch.nsh \
+	extras/package/win32/NSIS/languages/english.nsh \
+	extras/package/win32/NSIS/languages/estonian.nsh \
+	extras/package/win32/NSIS/languages/finnish.nsh \
+	extras/package/win32/NSIS/languages/french.nsh \
+	extras/package/win32/NSIS/languages/galician.nsh \
+	extras/package/win32/NSIS/languages/german.nsh \
+	extras/package/win32/NSIS/languages/hebrew.nsh \
+	extras/package/win32/NSIS/languages/hungarian.nsh \
+	extras/package/win32/NSIS/languages/italian.nsh \
+	extras/package/win32/NSIS/languages/japanese.nsh \
+	extras/package/win32/NSIS/languages/lithuanian.nsh \
+	extras/package/win32/NSIS/languages/occitan.nsh \
+	extras/package/win32/NSIS/languages/polish.nsh \
+	extras/package/win32/NSIS/languages/punjabi.nsh \
+	extras/package/win32/NSIS/languages/russian.nsh
+	extras/package/win32/NSIS/languages/romanian.nsh \
+	extras/package/win32/NSIS/languages/schinese.nsh \
+	extras/package/win32/NSIS/languages/slovak.nsh \
+	extras/package/win32/NSIS/languages/slovenian.nsh \
+	extras/package/win32/NSIS/languages/sorani.nsh \
+	extras/package/win32/NSIS/languages/spanish.nsh \
+	extras/package/win32/NSIS/languages/swedish.nsh
 
 dist_noinst_SCRIPTS = bootstrap
 nodist_noinst_SCRIPTS = compile
@@ -73,6 +88,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--disable-mad --disable-libmpeg2 \
 	--disable-faad --disable-skins2 \
 	--disable-live555 \
+	--disable-lua \
 	--disable-fribidi --disable-glx \
 	--disable-mkv \
 	--with-kde-solid='$${datadir}/kde4/apps'
@@ -89,7 +105,7 @@ AUTOMAKE_OPTIONS = \
 ChangeLog: Makefile.am
 	rm -f -- "$@"
 	cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs
-	$(LN_S) -f doc/ChangeLog-2012 "$@"
+	$(LN_S) -f doc/ChangeLog-2013 "$@"
 
 ###############################################################################
 # Mac OS X project
@@ -105,12 +121,14 @@ EXTRA_DIST += \
 	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/DetachedVideoWindow.xib \
 	extras/package/macosx/Resources/English.lproj/ErrorPanel.xib \
 	extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \
 	extras/package/macosx/Resources/English.lproj/MainMenu.xib \
 	extras/package/macosx/Resources/English.lproj/MediaInfo.xib \
 	extras/package/macosx/Resources/English.lproj/Open.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 \
 	extras/package/macosx/Resources/English.lproj/VideoEffects.xib \
 	extras/package/macosx/Resources/English.lproj/Wizard.xib \
@@ -212,6 +230,8 @@ EXTRA_DIST += \
 	extras/package/macosx/Resources/mainwindow/effects-double-buttons@2x.png \
 	extras/package/macosx/Resources/mainwindow/effects-one-button-blue.png \
 	extras/package/macosx/Resources/mainwindow/effects-one-button-blue@2x.png \
+	extras/package/macosx/Resources/mainwindow/effects-one-button-pressed.png \
+	extras/package/macosx/Resources/mainwindow/effects-one-button-pressed@2x.png \
 	extras/package/macosx/Resources/mainwindow/effects-one-button.png \
 	extras/package/macosx/Resources/mainwindow/effects-one-button@2x.png \
 	extras/package/macosx/Resources/mainwindow/forward-3btns-pressed.png \
@@ -333,6 +353,8 @@ EXTRA_DIST += \
 	extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons_dark@2x.png \
 	extras/package/macosx/Resources/mainwindow_dark/effects-one-button-blue_dark.png \
 	extras/package/macosx/Resources/mainwindow_dark/effects-one-button-blue_dark@2x.png \
+	extras/package/macosx/Resources/mainwindow_dark/effects-one-button-pressed-dark.png \
+	extras/package/macosx/Resources/mainwindow_dark/effects-one-button-pressed-dark@2x.png \
 	extras/package/macosx/Resources/mainwindow_dark/effects-one-button_dark.png \
 	extras/package/macosx/Resources/mainwindow_dark/effects-one-button_dark@2x.png \
 	extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark-pressed.png \
@@ -653,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
 ###############################################################################
@@ -670,4 +688,5 @@ update-po:
 ###############################################################################
 include extras/package/macosx/package.mak
 include extras/package/win32/package.mak
+include extras/package/win32/msi.mak