new windows installer script, clarified licenses

[chaz/yoink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 95437f2ee2027a5ac276ec2045336f6adf28762e..b1ac384fa24020ff0a1c3febe370a562eeb8e031 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,8 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = yajl src data doc
+SUBDIRS = data doc src extra
 
-EXTRA_DIST = yajl
 
 run: all
        $(MAKE) -C src run
@@ -11,3 +10,19 @@ run: all
 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
+       $(RPMBUILD) -ba --nodeps extra/yoink.spec 
+