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

diff --git a/Makefile.am b/Makefile.am
index b8f7420..f3c3773 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,43 +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_NAME = yoinksetup-$(VERSION).exe
-
-.PHONY: package
-package: $(INSTALLER_NAME)
-
-$(INSTALLER_NAME): all
-	@echo "Creating win32 installer..."
-	@(sh make-win32-installer.sh $(INSTALLER_NAME) 2> installer.log 1>&2 && \
-	  rm installer.log && echo "Done.") || \
-	(echo "Installer compilation failed!"; \
-	 echo "Check installer.log for details."; exit 1)
+portable: all
+	$(SH) win32/makepackage.sh -p $(prefix) -d "$(DATA_FILES)" \
+		-s $(STRIP) -V $(VERSION)
 
-else
-if LINUX
+installer: all
+	$(SH) win32/makepackage.sh -p $(prefix) -d "$(DATA_FILES)" \
+		-s $(STRIP) -V $(VERSION) -i $(MAKENSIS)
 
-.PHONY: package
-package: rpm
-
-rpm: dist-bzip2
-	@echo "Creating RPM package..."
-	@($(RPMBUILD) -ba --nodeps extra/yoink.spec 2> rpmbuild.log 1>&2 && \
-		rm rpmbuild.log && echo "Done.") || \
-		(echo "rpmbuild failed!"; \
-		echo "Check rpmbuild.log for details."; exit 1)
-
-endif
 endif