lua http: fix rendering on iP_d (fix #8319)

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c926d06d44800cbd96c3f658c4011bd22088de30..ff0f1f575ba72825a4356004d9d81b8352a3728a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,6 +23,22 @@ EXTRA_DIST = \
        extras/package/npapi.am \
        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 \
@@ -73,6 +89,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 +106,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,6 +122,7 @@ 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 \
@@ -213,6 +231,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 \
@@ -334,6 +354,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 \
@@ -671,4 +693,5 @@ update-po:
 ###############################################################################
 include extras/package/macosx/package.mak
 include extras/package/win32/package.mak
+include extras/package/win32/msi.mak