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

diff --git a/Makefile.am b/Makefile.am
index b1ac384..75f866e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,13 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = data doc src extra
+if WIN32
+SUBDIRS = data src
+else
+SUBDIRS = data doc src
+endif
 
+EXTRA_DIST = extra
 
 run: all
 	$(MAKE) -C src run
@@ -11,18 +16,15 @@ debug: all
 	$(MAKE) -C src debug
 
 
-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
+.PHONY: docs package
 
+docs:
+	$(DOXYGEN)
 
-RPMBUILD = rpmbuild
-
-rpm: dist-bzip2
-	$(RPMBUILD) -ba --nodeps extra/yoink.spec 
+if WIN32
+package: all
+	$(MAKE) -C win32 installer
+else
+package: dist-bzip2
+endif