removed logging from script to fix compile error

[chaz/yoink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0df126fe3de89f4329d5f6f4fe4d0ec5786e4ba6..7f62c7d7dad4f09e8e70be2a5c2d4bd3e6ab35ed 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,30 +1,31 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = data src
-EXTRA_DIST = extra
+SUBDIRS = data doc src
 
-if WIN32
-else
-       SUBDIRS += doc
-endif
+EXTRA_DIST = autogen.sh extra win32
 
-run: all
-       $(MAKE) -C src run
 
-debug: all
-       $(MAKE) -C src debug
+.PHONY: run debug docs portable installer
 
+run: all
+       @cd src && $(MAKE) run
 
-.PHONY: docs package
+debug: all
+       @cd src && $(MAKE) debug
 
 docs:
        $(DOXYGEN)
 
 if WIN32
-package: all
-       $(MAKE) -C win32 installer
-else
-package: dist-bzip2
+
+portable: all
+       $(SH) win32/makepackage.sh -p $(prefix) -d "@DATA_FILES@" \
+               -s $(STRIP) -V $(VERSION)
+
+installer: all
+       $(SH) win32/makepackage.sh -p $(prefix) -d "@DATA_FILES@" \
+               -s $(STRIP) -V $(VERSION) -i $(MAKENSIS)
+
 endif