X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=Makefile.am;h=b8f74200619110b574c312cd191ee1300a96fcc0;hp=f6bb9c38dfbe4cfee457dee00f15d9bb13a208cc;hb=9380d855c739df67d9af175f1d36ebec30346dda;hpb=58cedf00e6ebf6282938c019b8eb105e3fb05eaa

diff --git a/Makefile.am b/Makefile.am
index f6bb9c3..b8f7420 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = data doc yajl src extra
-
-EXTRA_DIST = yajl
+SUBDIRS = data doc src extra
 
 
 run: all
@@ -13,8 +11,33 @@ debug: all
 	$(MAKE) -C src debug
 
 
-RPMBUILD = rpmbuild
+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)
+
+else
+if LINUX
+
+.PHONY: package
+package: rpm
 
 rpm: dist-bzip2
-	$(RPMBUILD) -ba --nodeps extra/yoink.spec 
+	@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