[Gzz-commits] gzz ./Makefile gfx/librenderables/Makefile meta...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/08/28 10:22:38

Modified files:
        .              : Makefile 
        gfx/librenderables: Makefile 
        metacode       : uml.py 
Added files:
        gfx/librenderables: Makefile-javaonly 

Log message:
        Don't use real makefile when compiling only renderables.py for 
GZZGL.java: it has too many dependencies.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Makefile.diff?tr1=1.146&tr2=1.147&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/Makefile-javaonly?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/librenderables/Makefile.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/uml.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text

Patches:
Index: gzz/Makefile
diff -c gzz/Makefile:1.146 gzz/Makefile:1.147
*** gzz/Makefile:1.146  Wed Aug 28 08:27:56 2002
--- gzz/Makefile        Wed Aug 28 10:22:38 2002
***************
*** 202,208 ****
  GENERATED=gzz/mediaserver/MediaTypes.java gzz/gfx/gl/GZZGL.java
  
  gzz/gfx/gl/GZZGL.java: gfx/librenderables/*
!       (cd gfx/librenderables; make ../../gzz/gfx/gl/GZZGL.java)
  
  basalt/gzz/impl/Merge1.java: basalt/gzz/impl/Merge1 gzz/impl/genmerge.pl
        perl gzz/impl/genmerge.pl basalt/gzz/impl/Merge1
--- 202,208 ----
  GENERATED=gzz/mediaserver/MediaTypes.java gzz/gfx/gl/GZZGL.java
  
  gzz/gfx/gl/GZZGL.java: gfx/librenderables/*
!       (cd gfx/librenderables; make -f Makefile-javaonly 
../../gzz/gfx/gl/GZZGL.java)
  
  basalt/gzz/impl/Merge1.java: basalt/gzz/impl/Merge1 gzz/impl/genmerge.pl
        perl gzz/impl/genmerge.pl basalt/gzz/impl/Merge1
Index: gzz/gfx/librenderables/Makefile
diff -c gzz/gfx/librenderables/Makefile:1.3 gzz/gfx/librenderables/Makefile:1.4
*** gzz/gfx/librenderables/Makefile:1.3 Wed Aug  7 08:26:30 2002
--- gzz/gfx/librenderables/Makefile     Wed Aug 28 10:22:38 2002
***************
*** 1,17 ****
  include ../rules.mk
  
  
- sources = Renderables.cxx
- 
- all: ../../gzz/gfx/gl/GZZGL.java $(sources:.cxx=.o)
  
- ../../gzz/gfx/gl/GZZGL.java RealRenderables.hxx RealRenderables-jni.hxx: 
renderables.py
-       python2.2 renderables.py
- 
- Renderables.cxx: RealRenderables.hxx
- 
- include $(sources:.cxx=.dep)
  
  
  
  
--- 1,13 ----
  include ../rules.mk
+ include $(sources:.cxx=.dep)
+ include Makefile-javaonly
  
  
  
  
  
+ sources = Renderables.cxx
  
+ all: ../../gzz/gfx/gl/GZZGL.java $(sources:.cxx=.o)
  
+ Renderables.cxx: RealRenderables.hxx
Index: gzz/metacode/uml.py
diff -c gzz/metacode/uml.py:1.15 gzz/metacode/uml.py:1.16
*** gzz/metacode/uml.py:1.15    Mon Aug 26 11:43:27 2002
--- gzz/metacode/uml.py Wed Aug 28 10:22:38 2002
***************
*** 110,123 ****
            if self.sourcename:
                srcx = "xpart("+self.sourcename + ".c)"
            else:
!               srcx = " %%.xd - 50 "
            dstx = "xpart("+self.targetname + ".c)"
            srcx, dstx = [self.repl(i) for i in [srcx, dstx]]
            s = self.repl("""
!               numeric %%.yu;
!               numeric %%.yl;
!               numeric %%.xs;
!               numeric %%.xd;
                %%.xs = %(srcx)s;
                %%.xd = %(dstx)s;
            """) % locals()
--- 110,120 ----
            if self.sourcename:
                srcx = "xpart("+self.sourcename + ".c)"
            else:
!               srcx = " %%.xd - 100 "
            dstx = "xpart("+self.targetname + ".c)"
            srcx, dstx = [self.repl(i) for i in [srcx, dstx]]
            s = self.repl("""
!               numeric %%.yu, %%.yl, %%.xs, %%.xd;
                %%.xs = %(srcx)s;
                %%.xd = %(dstx)s;
            """) % locals()