new windows installer script, clarified licenses

[chaz/yoink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b77b1f2b3520bc622f9a6b78d7bb13b0294d22c8..b1ac384fa24020ff0a1c3febe370a562eeb8e031 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
 
 ACLOCAL_AMFLAGS = -I m4
 

-SUBDIRS = yajl src data doc
-
-EXTRA_DIST = yajl
+SUBDIRS = data doc src extra

 
 
 run: all
 
 
 run: all


@@ -13,8 +11,18 @@ debug: all
        $(MAKE) -C src debug
 
 
        $(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
 
 RPMBUILD = rpmbuild
 

-RPM: dist-bzip2
+rpm: dist-bzip2

        $(RPMBUILD) -ba --nodeps extra/yoink.spec 
 
        $(RPMBUILD) -ba --nodeps extra/yoink.spec