--- ray/src/gen/Rmakefile	2003/02/22 02:07:23	2.7
+++ ray/src/gen/Rmakefile	2004/08/21 11:54:06	2.12
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.7 2003/02/22 02:07:23 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.12 2004/08/21 11:54:06 greg Exp $
 #
 # Makefile for object generation programs
 #
@@ -25,7 +25,7 @@ install:	$(PROGS) $(LIBFILES) glaze.csh
 	cp $(PROGS) $(INSTDIR)
 	cp glaze.csh $(INSTDIR)/glaze
 	chmod 755 $(INSTDIR)/glaze
-	cd $(LIBDIR) ; rm -f $(LIBFILES)
+	cd $(LIBDIR) && rm -f $(LIBFILES)
 	cp $(LIBFILES) $(LIBDIR)
 
 clean:
@@ -61,8 +61,8 @@ mkillum:	mkillum.o mkillum2.o mkillum3.o
 genrev:	genrev.o 
 	$(CC) $(CFLAGS) -o genrev genrev.o -lrt $(MLIB)
 
-gencat: gencat.o
-	$(CC) $(CFLAGS) -o gencat gencat.o -lrt $(MLIB)
+gencatenary: gencat.o
+	$(CC) $(CFLAGS) -o gencatenary gencat.o -lrt $(MLIB)
 
 genworm:	genworm.o
 	$(CC) $(CFLAGS) -o genworm genworm.o -lrt $(MLIB)
@@ -76,14 +76,20 @@ genclock:	genclock.o
 genbranch:	genbranch.o
 	$(CC) $(CFLAGS) -o genbranch genbranch.o $(MLIB)
 
-gensurf.o:	../common/standard.h ../common/mat4.h ../common/fvect.h
-
 genworm.o replmarks.o:	../common/fvect.h
 
-xform.o:	../common/standard.h ../common/mat4.h ../common/fvect.h \
-../common/otypes.h ../common/object.h
+gensurf.o xform.o:	../common/standard.h \
+../common/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/rterror.h \
+../common/mat4.h ../common/fvect.h
 
+genworm.o genrev.o gensurf.o:	../common/resolu.h ../common/rterror.h
+
+xform.o:	../common/otypes.h ../common/object.h
+
 mkillum.o mkillum2.o mkillum3.o:	mkillum.h ../common/standard.h \
 ../common/mat4.h ../common/fvect.h ../common/otypes.h ../common/object.h
 
 gensky.o:	../common/color.h
+
+gensurf.o genworm.o genrev.o:	../common/calcomp.h