From 763f5c562f360ba4e836e210fb87cb897b6d135c Mon Sep 17 00:00:00 2001
From: Rob Norris <rw_norris@hotmail.com>
Date: Thu, 31 Jan 2013 01:23:24 +0000
Subject: [PATCH] Add Windows installer files to be included in a 'make dist'
 source distribution

---
 .gitignore                               | 8 ++++++++
 Makefile.am                              | 2 +-
 configure.ac                             | 6 +++++-
 win32/Makefile.am                        | 6 ++++++
 win32/installer/Makefile.am              | 6 ++++++
 win32/installer/pixmaps/Makefile.am      | 4 ++++
 win32/installer/translations/Makefile.am | 5 +++++
 7 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 win32/Makefile.am
 create mode 100644 win32/installer/Makefile.am
 create mode 100644 win32/installer/pixmaps/Makefile.am
 create mode 100644 win32/installer/translations/Makefile.am

diff --git a/.gitignore b/.gitignore
index 8a9ce325..9a7322c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -109,5 +109,13 @@ help/C/*html
 /po/stamp-it
 
 # win32/
+win32/Makefile
+win32/Makefile.in
+win32/installer/Makefile
+win32/installer/Makefile.in
+win32/installer/pixmaps/Makefile
+win32/installer/pixmaps/Makefile.in
 win32/installer/pixmaps/*o
+win32/installer/translations/Makefile
+win32/installer/translations/Makefile.in
 win32/installer/viking*.exe
diff --git a/Makefile.am b/Makefile.am
index 1a7d0a07..10bcbfc1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 if VIKING_DOC
 	DO_DOCS = "help doc"
 endif
-SUBDIRS = src test data po $(DO_DOCS)
+SUBDIRS = src test data po win32 $(DO_DOCS)
 
 INTLTOOL = \
 	intltool-extract.in \
diff --git a/configure.ac b/configure.ac
index 5333f58d..839c1168 100644
--- a/configure.ac
+++ b/configure.ac
@@ -351,7 +351,11 @@ AC_CONFIG_FILES([
 		src/icons/Makefile
 		po/Makefile.in
 		data/Makefile
-		test/Makefile])
+		test/Makefile
+		win32/Makefile
+		win32/installer/Makefile
+		win32/installer/pixmaps/Makefile
+		win32/installer/translations/Makefile])
 AM_COND_IF([VIKING_DOC],
 	[AC_CONFIG_FILES([
 		help/Makefile
diff --git a/win32/Makefile.am b/win32/Makefile.am
new file mode 100644
index 00000000..0afcfbe4
--- /dev/null
+++ b/win32/Makefile.am
@@ -0,0 +1,6 @@
+
+EXTRA_DIST = \
+	installer.bat \
+	README.txt
+
+SUBDIRS = installer
diff --git a/win32/installer/Makefile.am b/win32/installer/Makefile.am
new file mode 100644
index 00000000..03cc1ce4
--- /dev/null
+++ b/win32/installer/Makefile.am
@@ -0,0 +1,6 @@
+
+EXTRA_DIST = \
+	viking-installer.nsi \
+	langmacros.nsh
+
+SUBDIRS = pixmaps translations
diff --git a/win32/installer/pixmaps/Makefile.am b/win32/installer/pixmaps/Makefile.am
new file mode 100644
index 00000000..6fd999ee
--- /dev/null
+++ b/win32/installer/pixmaps/Makefile.am
@@ -0,0 +1,4 @@
+
+EXTRA_DIST = \
+	viking_icon.ico \
+	viking_icon.rc
diff --git a/win32/installer/translations/Makefile.am b/win32/installer/translations/Makefile.am
new file mode 100644
index 00000000..1537dfd7
--- /dev/null
+++ b/win32/installer/translations/Makefile.am
@@ -0,0 +1,5 @@
+
+EXTRA_DIST = \
+	english.nsh \
+	french.nsh \
+	spanish.nsh
-- 
2.39.5