make am && make cm

diff --git a/.gitignore b/.gitignore
index 47ba2c70aef6527c1a60f8176b254ac5006c02cf..ae3f0880454417a07a0226fdac5471c3d000c714 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,7 @@
 *~
 *.cache
 build
-build1
-build2
+build-*
 site.print.htm
 changes.htm
 *-linux-*

diff --git a/GNUmakefile b/GNUmakefile
index 860adcbef1bde0f9cb9201cb3081c6983c0a929a..3571fd11e8b486ccc0c1735d22abb6e4ba294086 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -9,9 +9,11 @@ default:
        @ test ! -f Makefile || test -f build/Makefile || $(MAKE) all
        @ test ! -f Makefile || test -f build/Makefile || echo 'DONE make all - please run make check (before make install)'
 
-cm cmake: ; rm -rf build; mkdir build; cd build && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local
-am autom: ; rm -rf build2; mkdir build2; cd build2 && sh ../configure --prefix=$$HOME/local --enable-sdl
-2: ; cd build2 && $(MAKE) all
+.PHONY: build-am build-cm
+build-cm: ; mkdir build-cm; cd build-cm && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=$$HOME/local
+build-am: ; mkdir build-am; cd build-am && sh ../configure --prefix=$$HOME/local --enable-sdl
+cm cmake: ; rm -rf build-cm; $(MAKE) build-cm && cd build-cm && $(MAKE) all
+am autom: ; rm -rf build-am; $(MAKE) build-am && cd build-am && $(MAKE) all
 
 new: ; rm -rf build; $(MAKE) default