new windows installer script, clarified licenses

[chaz/yoink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ad16dbe049e6fe1ab7b1944f8dcd5f04032bfac1..b1ac384fa24020ff0a1c3febe370a562eeb8e031 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,28 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
 
 ACLOCAL_AMFLAGS = -I m4
 

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

 
 

-EXTRA_DIST = yajl

 
 run: all
 
 run: all

-       $(top_srcdir)/src/yoink
+       $(MAKE) -C src run

 
 debug: all
 
 debug: all

-       gdb $(top_srcdir)/src/yoink
+       $(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