X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=Makefile.am;h=7f62c7d7dad4f09e8e70be2a5c2d4bd3e6ab35ed;hp=b77b1f2b3520bc622f9a6b78d7bb13b0294d22c8;hb=58c1f9a499d3bb80ea2869b29c714f61e656d48d;hpb=16d1a05b0777e97a45c48e2874aa4e5cc791282e

diff --git a/Makefile.am b/Makefile.am
index b77b1f2..7f62c7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +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)
 
-RPMBUILD = rpmbuild
+installer: all
+	$(SH) win32/makepackage.sh -p $(prefix) -d "@DATA_FILES@" \
+		-s $(STRIP) -V $(VERSION) -i $(MAKENSIS)
 
-RPM: dist-bzip2
-	$(RPMBUILD) -ba --nodeps extra/yoink.spec 
+endif