X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=Makefile.am;h=7f62c7d7dad4f09e8e70be2a5c2d4bd3e6ab35ed;hp=b1ac384fa24020ff0a1c3febe370a562eeb8e031;hb=00612586426be6d9a976f141a25ffc1f0d284501;hpb=6dd7ae54e742339cc49e640d1076a310a0f4eedd

diff --git a/Makefile.am b/Makefile.am
index b1ac384..7f62c7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,28 +1,31 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = data doc src extra
+SUBDIRS = data doc src
 
+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
-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
 
+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