new convenient script methods

[chaz/yoink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 95437f2ee2027a5ac276ec2045336f6adf28762e..7f62c7d7dad4f09e8e70be2a5c2d4bd3e6ab35ed 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,31 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = yajl src data doc
+SUBDIRS = data doc src
 
-EXTRA_DIST = yajl
+EXTRA_DIST = autogen.sh extra win32
+
+
+.PHONY: run debug docs portable installer
 
 run: all
-       $(MAKE) -C src run
+       @cd src && $(MAKE) run
 
 debug: all
-       $(MAKE) -C src debug
+       @cd src && $(MAKE) debug
+
+docs:
+       $(DOXYGEN)
+
+if WIN32
+
+portable: all
+       $(SH) win32/makepackage.sh -p $(prefix) -d "@DATA_FILES@" \
+               -s $(STRIP) -V $(VERSION)
+
+installer: all
+       $(SH) win32/makepackage.sh -p $(prefix) -d "@DATA_FILES@" \
+               -s $(STRIP) -V $(VERSION) -i $(MAKENSIS)
+
+endif