[Gzz-commits] gzz Documentation/Makefile Documentation/misc/u...

[Vesa Kaihlavirta]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Vesa Kaihlavirta <address@hidden>       03/01/27 09:45:43

Modified files:
        Documentation  : Makefile 
        Documentation/misc/uml: Makefile 
        gfx            : Makefile 
        lava/gfx       : Makefile 

Log message:
        'make' -> '$(MAKE)' everywhere

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/Makefile.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/misc/uml/Makefile.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/Makefile.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gfx/Makefile.diff?tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: gzz/Documentation/Makefile
diff -u gzz/Documentation/Makefile:1.11 gzz/Documentation/Makefile:1.12
--- gzz/Documentation/Makefile:1.11     Wed Jan 16 14:48:24 2002
+++ gzz/Documentation/Makefile  Mon Jan 27 09:45:42 2003
@@ -23,11 +23,11 @@
                done
 
 ps:
-       (cd CellScroll; make ps)
-       (cd Clang_Design; make ps)
-       (cd Gentle_Introduction; make ps)
-       (cd Interfacing; make ps)
-       (cd Spec; make ps)
+       (cd CellScroll; $(MAKE) ps)
+       (cd Clang_Design; $(MAKE) ps)
+       (cd Gentle_Introduction; $(MAKE) ps)
+       (cd Interfacing; $(MAKE) ps)
+       (cd Spec; $(MAKE) ps)
 
 # Special target for Tjl only ;)
 mvps: ps
Index: gzz/Documentation/misc/uml/Makefile
diff -u gzz/Documentation/misc/uml/Makefile:1.5 
gzz/Documentation/misc/uml/Makefile:1.6
--- gzz/Documentation/misc/uml/Makefile:1.5     Wed Dec 18 06:37:00 2002
+++ gzz/Documentation/misc/uml/Makefile Mon Jan 27 09:45:42 2003
@@ -9,6 +9,6 @@
        rm -f *.gen.html
 
 %.html: %.rst
-       make -C ../../../ umldoc INPUT="Documentation/misc/uml/$*.rst"
+       $(MAKE) -C ../../../ umldoc INPUT="Documentation/misc/uml/$*.rst"
 
 
Index: gzz/gfx/Makefile
diff -u gzz/gfx/Makefile:1.17 gzz/gfx/Makefile:1.18
--- gzz/gfx/Makefile:1.17       Sat Nov  2 06:05:44 2002
+++ gzz/gfx/Makefile    Mon Jan 27 09:45:42 2003
@@ -17,7 +17,7 @@
 
 subdirs:
        set -- $(SUBDIRS); \
-       while [ $$? -eq 0 ] && [ $$# -gt 0 ] ; do make -C $$1 && shift; done
+       while [ $$? -eq 0 ] && [ $$# -gt 0 ] ; do $(MAKE) -C $$1 && shift; done
 
 GZZGL.java GzzGLRen-jni.cxx: renderables.py
        python2.2 renderables.py
Index: gzz/lava/gfx/Makefile
diff -u gzz/lava/gfx/Makefile:1.29 gzz/lava/gfx/Makefile:1.30
--- gzz/lava/gfx/Makefile:1.29  Mon Sep  2 08:59:41 2002
+++ gzz/lava/gfx/Makefile       Mon Jan 27 09:45:42 2003
@@ -33,11 +33,11 @@
        g++-3.1 -g -O3 -march=pentium4 -ffast-math -fno-math-errno 
-fstrength-reduce -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop 
-frerun-loop-opt -fexpensive-optimizations -fregmove -fschedule-insns2 
-funroll-loops -fmove-all-movables -falign-loops -fsingle-precision-constant 
-frename-registers rd3.cxx -o rd3 -lglut -Wa,-alh=rd3.s
 
 papermill.o: papermill.cxx paperobj.hxx texgen.hxx
-       cd ../../gzz/gfx/gl/callgl && make callgl.o
+       cd ../../gzz/gfx/gl/callgl && $(MAKE) callgl.o
        g++-3.0 -I fonts/libgummi -g -c papermill.cxx 
 
 paper3: paper3.cxx texgen.hxx paperobj.hxx papermill.o
-       cd ../../gzz/gfx/gl/callgl && make callgl.o
+       cd ../../gzz/gfx/gl/callgl && $(MAKE) callgl.o
        g++-3.0 -I fonts/libgummi -g -o paper3 paper3.cxx papermill.o 
../../gzz/gfx/gl/callgl/callgl.o $(LIBS) 
 
 
@@ -49,7 +49,7 @@
 
 
 bgtest: bgtest.cxx shader/bgnoise.shader
-       cd shader && make bgnoise.o
+       cd shader && $(MAKE) bgnoise.o
        g++-3.0 bgtest.cxx shader/shader.o shader/bgnoise.o shader/Tube*.o 
shader/ppbg*.o -lglut -o bgtest
 
 bevel.o:
@@ -61,7 +61,7 @@
        g++-3.0 colorvis.cxx -o colorvis
 
 ../../gzz/gfx/gl/callgl/calltest::
-       cd ../../gzz/gfx/gl/callgl && make calltest
+       cd ../../gzz/gfx/gl/callgl && $(MAKE) calltest
 
 showcolor: colorvis ../../gzz/gfx/gl/callgl/calltest
        ./colorvis | ../../gzz/gfx/gl/callgl/calltest /dev/stdin