new windows installer script, clarified licenses

[chaz/yoink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f6bb9c38dfbe4cfee457dee00f15d9bb13a208cc..b1ac384fa24020ff0a1c3febe370a562eeb8e031 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = data doc yajl src extra
-
-EXTRA_DIST = yajl
+SUBDIRS = data doc src extra
 
 
 run: all
@@ -13,6 +11,16 @@ debug: all
        $(MAKE) -C src debug
 
 
+if WIN32
+installer: all
+       @echo "Creating win32 installer..."
+       @(sh make-win32-installer.sh 2> installer.log 1>&2 && \
+         rm installer.log && echo "Done.") || \
+       (echo "Installer compilation failed!"; \
+        echo "Check installer.log for details."; exit 1)
+endif
+
+
 RPMBUILD = rpmbuild
 
 rpm: dist-bzip2