Fixed proto files

diff --git a/util/grind/proto.main b/util/grind/proto.main
index 2d57b53..a519006 100644 (file)
--- a/util/grind/proto.main
+++ b/util/grind/proto.main
@@ -16,6 +16,7 @@ MALLOC =      $(LIBDIR)/malloc.$(SUF)
 MODLIB = \
                $(LIBDIR)/libassert.$(LIBSUF) \
                $(LIBDIR)/liballoc.$(LIBSUF) \
+               $(LIBDIR)/libobject.$(LIBSUF) \
                $(MALLOC) \
                $(LIBDIR)/libprint.$(LIBSUF) \
                $(LIBDIR)/libstring.$(LIBSUF) \
@@ -39,16 +40,16 @@ LDFLAGS =   $(PROFILE) $(LDOPTIONS)
 # C_SRC and OBJ should be set here.
 #LISTS         do not remove this line!
 
-all:           main
+all:           grind
 
 clean:
-               rm -f *.$(SUF) main
+               rm -f *.$(SUF) grind
 
 lint:
                $(LINT) $(LINTFLAGS) $(C_SRC) $(LINTLIBS)
 
-main:          $(OBJ)
-               $(CC) $(LDFLAGS) $(OBJ) $(LIBS) -o main
+grind:         $(OBJ)
+               $(CC) $(LDFLAGS) $(OBJ) $(LIBS) -o grind
 
 # do not remove the next line; it is used for generating dependencies
 #DEPENDENCIES

diff --git a/util/grind/proto.make b/util/grind/proto.make
index fb52699..33b34bc 100644 (file)
--- a/util/grind/proto.make
+++ b/util/grind/proto.make
@@ -87,7 +87,7 @@ pr:
 lint:          make.main
                make -f make.main lint
 
-Cfiles:                hfiles LLfiles $(GEN_C) $(GEN_H) Makefile
+Cfiles:                LLfiles $(GEN_C) $(GEN_H) Makefile
                echo $(CFILES) | tr ' ' '\012' > Cfiles
                echo $(HFILES) | tr ' ' '\012' >> Cfiles
 
@@ -129,7 +129,7 @@ lists:              Cfiles
 clean:
                -make -f make.main clean
                rm -f $(GEN_C) $(GEN_G) $(GEN_H) \
-                       hfiles LL1files LL2files Cfiles LL.output DBS.output
+                       LL1files LL2files Cfiles LL.output DBS.output
                rm -f resolved *.dep lists make.main make_macros
 
 LLfiles:       LL1files LL2files
@@ -142,10 +142,6 @@ LL2files:  $(GFILES2)
                $(LLGEN) $(LLGENOPTIONS) $(GFILES2)
                @touch LL2files
 
-hfiles:                Parameters $(SRC_DIR)/make.hfiles
-               $(SRC_DIR)/make.hfiles Parameters
-               touch hfiles
-
 tokenfile.g:   $(SRC_DIR)/tokenname.c $(SRC_DIR)/make.tokfile
                $(SRC_DIR)/make.tokfile <$(SRC_DIR)/tokenname.c >tokenfile.g