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

diff --git a/Makefile.am b/Makefile.am
index 0df126f..f3c3773 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,30 +1,31 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = data src
-EXTRA_DIST = extra
+SUBDIRS = data doc src
 
-if WIN32
-else
-	SUBDIRS += doc
-endif
+EXTRA_DIST = autogen.sh extra win32
 
-run: all
-	$(MAKE) -C src run
 
-debug: all
-	$(MAKE) -C src debug
+.PHONY: run debug docs portable installer
 
+run: all
+	@$(CD) src && $(MAKE) run
 
-.PHONY: docs package
+debug: all
+	@$(CD) src && $(MAKE) debug
 
 docs:
 	$(DOXYGEN)
 
 if WIN32
-package: all
-	$(MAKE) -C win32 installer
-else
-package: dist-bzip2
+
+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