preliminary AM_SILENT_RULES support

[chaz/yoink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b1ac384fa24020ff0a1c3febe370a562eeb8e031..bb29cd0c02ce9bd61aa72f4363d499e3e4ad9329 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,28 +1,26 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = data doc src extra
+SUBDIRS = data doc src
 
+EXTRA_DIST = autogen.sh extra
+
+
+.PHONY: run debug docs package
 
 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: 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)
+package: all
+       @cd win32 && $(MAKE) installer
+else
+package: dist-bzip2
 endif
 
-
-RPMBUILD = rpmbuild
-
-rpm: dist-bzip2
-       $(RPMBUILD) -ba --nodeps extra/yoink.spec 
-