new timer class

[chaz/yoink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b1ac384fa24020ff0a1c3febe370a562eeb8e031..b8f74200619110b574c312cd191ee1300a96fcc0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,17 +12,32 @@ debug: all
 
 
 if WIN32
-installer: all
+
+INSTALLER_NAME = yoinksetup-$(VERSION).exe
+
+.PHONY: package
+package: $(INSTALLER_NAME)
+
+$(INSTALLER_NAME): all
        @echo "Creating win32 installer..."
-       @(sh make-win32-installer.sh 2> installer.log 1>&2 && \
+       @(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)
-endif
 
+else
+if LINUX
 
-RPMBUILD = rpmbuild
+.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