Add Windows installer files to be included in a 'make dist' source distribution

diff --git a/.gitignore b/.gitignore
index 8a9ce325ac674e61dde7b2444a7f98e6daa00d7f..9a7322c2d68099abf10e94df6f7ea79400696063 100644 (file)
--- 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 1a7d0a076349d70cce5b70734129ce5444a98cc3..10bcbfc1b093f26e547d5edf7dc05553f57c2243 100644 (file)
--- 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 5333f58df351db5ec9dca86fd1d6fc49a4cf2c3d..839c1168d4e462e431bfed22276c2bc11af712ba 100644 (file)
--- 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 (file)
index 0000000..0afcfbe
--- /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 (file)
index 0000000..03cc1ce
--- /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 (file)
index 0000000..6fd999e
--- /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 (file)
index 0000000..1537dfd
--- /dev/null
+++ b/win32/installer/translations/Makefile.am
@@ -0,0 +1,5 @@
+
+EXTRA_DIST = \
+       english.nsh \
+       french.nsh \
+       spanish.nsh