X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=Makefile.am;h=f3c3773fa70b7f40aa70e45d32fa50c1e4aeaf1b;hp=95437f2ee2027a5ac276ec2045336f6adf28762e;hb=0b8dbc2d02c7f78d273ad9cfdf05c927c648ffd1;hpb=838bc00015eb7f583c7cf4b3b1007697bf047da1

diff --git a/Makefile.am b/Makefile.am
index 95437f2..f3c3773 100644
--- 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