removed logging from script to fix compile error

[chaz/yoink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f6bb9c38dfbe4cfee457dee00f15d9bb13a208cc..7f62c7d7dad4f09e8e70be2a5c2d4bd3e6ab35ed 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,31 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = data doc yajl src extra
+SUBDIRS = data doc src
 
-EXTRA_DIST = yajl
+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
 
+portable: all
+       $(SH) win32/makepackage.sh -p $(prefix) -d "@DATA_FILES@" \
+               -s $(STRIP) -V $(VERSION)
 
-RPMBUILD = rpmbuild
+installer: all
+       $(SH) win32/makepackage.sh -p $(prefix) -d "@DATA_FILES@" \
+               -s $(STRIP) -V $(VERSION) -i $(MAKENSIS)
 
-rpm: dist-bzip2
-       $(RPMBUILD) -ba --nodeps extra/yoink.spec 
+endif