X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=f3c3773fa70b7f40aa70e45d32fa50c1e4aeaf1b;hb=0b8dbc2d02c7f78d273ad9cfdf05c927c648ffd1;hp=b77b1f2b3520bc622f9a6b78d7bb13b0294d22c8;hpb=16d1a05b0777e97a45c48e2874aa4e5cc791282e;p=chaz%2Fyoink

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