[Gzz-commits] gzz ./Makefile lava/gzz/zzutil/Containment.java...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/11/07 17:52:42

Modified files:
        .              : Makefile 
        lava/gzz/zzutil: Containment.java 
Removed files:
        gzz/impl/zob   : 
                         
ZOb_0000000008000000EC484C93C8000498173235BCA7C9C1FDABFB3FD6CB5FB75794C155E21E7AA2_2.java
 
                         
ZOb_0000000008000000EC484C93C8000498173235BCA7C9C1FDABFB3FD6CB5FB75794C155E21E7AA2_3.java
 
                         
ZOb_0000000008000000EC4D544501000466355872D0E82A85FD795CAADD5175D4571B364AB1B81AD7_7.java
 
        gzz/util/anytoimg: ImageManager.java 
        gzz/vob/demo/text: TextDemo1.java TextModel.java 
        lava/gzz/ideas : JoyImg.java Pedalexercitium.java 
        lava/gzz/index/impl: IndexKeeper.java 
        lava/gzz/storm/index: StormIndex.java 

Log message:
        Generate the list of to-be-compiled files through `find`; remove some 
classes that did not compile any more.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Makefile.diff?tr1=1.205&tr2=1.206&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/zzutil/Containment.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gzz/Makefile
diff -u gzz/Makefile:1.205 gzz/Makefile:1.206
--- gzz/Makefile:1.205  Thu Nov  7 17:07:00 2002
+++ gzz/Makefile        Thu Nov  7 17:52:41 2002
@@ -178,30 +178,33 @@
 
 # Can't add ZZClangOps since javac complains of doubly defined class...
 # maybe should use uniq?
-SRC0:=$(GENERATED) $(wildcard gzz/*.java gzz/errors/*.java gzz/diff/*.java \
-    gzz/impl/*.java gzz/impl/mirror/*.java gzz/media/*.java gzz/fuzzy/*.java \
-    gzz/control/*.java lava/gzz/media/*.java gzz/media/impl/*.java \
-    gzz/index/*.java gzz/index/impl/*.java gzz/zzutil/*.java 
gzz/impl/clasm/*.java \
-    gzz/util/*.java gzz/vob/*.java gzz/vob/buoy/*.java gzz/gfx/gl/*.java \
-    gzz/mediaserver/*.java lava/gzz/mediaserver/*.java 
gzz/mediaserver/*/*.java \
-    lava/gzz/mediaserver/*/*.java gzz/mediaserver/http/*/*.java \
-    lava/gzz/mediaserver/*/*/*.java gzz/ideas/*.java gzz/client/*.java \
-    gzz/view/*.java gzz/client/awt/*.java gzz/client/gl/*.java \
-    gzz/modules/contraints/*.java gzz/modules/mm/*.java lava/gzz/media/*.java \
-    lava/gzz/media/impl/*.java gzz/slices/*.java gzz/storm/*.java \
-    gzz/modules/email/*.java lava/test/gzz/storm/*.java gzz/vob/impl/*.java \
-    gzz/vob/vobs/*.java gzz/vob/linebreaking/*.java \
-    gzz/vob/impl/awt/*.java gzz/vob/impl/gl/*.java) $(TESTS) $(PP)
+SRC0:=$(GENERATED) `find gzz/ -name "*.java"`
+
+#$(wildcard gzz/*.java gzz/errors/*.java gzz/diff/*.java \
+#    gzz/impl/*.java gzz/impl/mirror/*.java gzz/media/*.java gzz/fuzzy/*.java \
+#    gzz/control/*.java lava/gzz/media/*.java gzz/media/impl/*.java \
+#    gzz/index/*.java gzz/index/impl/*.java gzz/zzutil/*.java 
gzz/impl/clasm/*.java \
+#    gzz/util/*.java gzz/vob/*.java gzz/vob/buoy/*.java gzz/gfx/gl/*.java \
+#    gzz/mediaserver/*.java lava/gzz/mediaserver/*.java 
gzz/mediaserver/*/*.java \
+#    lava/gzz/mediaserver/*/*.java gzz/mediaserver/http/*/*.java \
+#    lava/gzz/mediaserver/*/*/*.java gzz/ideas/*.java gzz/client/*.java \
+#    gzz/view/*.java gzz/client/awt/*.java gzz/client/gl/*.java \
+#    gzz/modules/contraints/*.java gzz/modules/mm/*.java lava/gzz/media/*.java 
\
+#    lava/gzz/media/impl/*.java gzz/slices/*.java gzz/storm/*.java \
+#    gzz/modules/email/*.java lava/test/gzz/storm/*.java gzz/vob/impl/*.java \
+#    gzz/vob/vobs/*.java gzz/vob/linebreaking/*.java \
+#    gzz/vob/impl/awt/*.java gzz/vob/impl/gl/*.java) $(TESTS) $(PP)
 # gzz/impl/zob/*.java 
 
-LAVASRC:= $(wildcard lava/gzz/*.java lava/gzz/impl/*.java 
lava/gzz/impl/errors/*.java lava/gzz/impl/mirror/*.java lava/gzz/storm/*.java 
lava/gzz/util/*.java lava/gzz/storm/headers/*.java lava/gzz/storm/impl/*.java)
+LAVASRC:= `find lava/gzz/ -name "*.java"`
+#$(wildcard lava/gzz/*.java lava/gzz/impl/*.java lava/gzz/impl/errors/*.java 
lava/gzz/impl/mirror/*.java lava/gzz/storm/*.java lava/gzz/util/*.java 
lava/gzz/storm/headers/*.java lava/gzz/storm/impl/*.java)
 
 BASALTSRC:= $(wildcard basalt/gzz/*.java basalt/gzz/impl/*.java)
 
 # Remove duplicates
 tmpfile := $(shell mktemp /tmp/fileXXXXXX)
 foo := $(shell echo 1>&2 "Tempfile is $(tmpfile)")
-SRC:=$(shell echo $(SRC0) $(LAVASRC) | perl -pe 's/\s+/\n/g' - | sort | uniq | 
egrep -v 'Doclet\.java$$'| tee $(tmpfile))
+SRC:=$(shell echo $(SRC0) | perl -pe 's/\s+/\n/g' - | sort | uniq | egrep -v 
'Doclet\.java$$'| tee $(tmpfile))
 
 # jikes := $(shell which jikes)
 # Disable for now, since on debian jikes is at a bad version
Index: gzz/lava/gzz/zzutil/Containment.java
diff -u gzz/lava/gzz/zzutil/Containment.java:1.2 
gzz/lava/gzz/zzutil/Containment.java:1.3
--- gzz/lava/gzz/zzutil/Containment.java:1.2    Tue Oct 29 16:21:25 2002
+++ gzz/lava/gzz/zzutil/Containment.java        Thu Nov  7 17:52:42 2002
@@ -22,6 +22,7 @@
  */
 package gzz.zzutil;
 import gzz.*;
+import gzz.media.*;
 
 /** Convenience methods for Ted's containment mechanism.
  */