Some more amake simplifications

diff --git a/util/grind/Amakefile b/util/grind/Amakefile
index 81700d4..acd8850 100644 (file)
--- a/util/grind/Amakefile
+++ b/util/grind/Amakefile
@@ -9,39 +9,17 @@ AMAKELIB = { . , /usr/local/lib/amake } ;
 
 %default grind ;
 
-TOKENNAMES = tokenname.c [
+%declare tokenname.c [
        gen_tokens,
        cc-dest = symbol2str.c,
        LL-dest = tokenfile.g
 ];
 
-DBS_LLTARGETS = {
-       db_symtab.c,
-       DBSpars.c,
-       DBSpars.h
-} ;
-
-DBS_LLSRC = {
-       db_symtab.g
-} ;
-
-CMD_LLTARGETS = {
-       tokenfile.c,
-       commands.c,
-       Lpars.c,
-       Lpars.h
-} ;
-
 CMD_LLSRC = {
        tokenname.c,
        commands.g
 } ;
 
-GENNEXTSRC = {
-       file.h,
-       next.c
-} ;
-
 CSRC = {
        main.c,
        list.c,
@@ -116,8 +94,14 @@ CFLAGS = {
        $DBFLAGS
 } ;
 
-LINTFLAGS = {
-       $INCLUDES
+DBS_LLTARGETS = {
+       db_symtab.c,
+       DBSpars.c,
+       DBSpars.h
+} ;
+
+DBS_LLSRC = {
+       db_symtab.g
 } ;
 
 %cluster {
@@ -126,6 +110,10 @@ LINTFLAGS = {
        %use LLgen(prefix => DBS) ;
 } ;
 
+LINTFLAGS = {
+       $INCLUDES
+} ;
+
 %cluster {
        %targets lint.out[type = lint-output];
        %sources $CSRC + $CMD_LLSRC + $DBS_LLTARGETS + $HHSRC + char.ct + operators.ot ;
@@ -134,5 +122,5 @@ LINTFLAGS = {
 
 %cluster {
        %targets grind[type = program];
-       %sources $CMD_LLSRC + $CSRC + $DBS_LLTARGETS + $HHSRC + char.ct + operators.ot ;
+       %sources $CSRC + $CMD_LLSRC + $DBS_LLTARGETS + $HHSRC + char.ct + operators.ot ;
 } ;

diff --git a/util/grind/LLgen.amk b/util/grind/LLgen.amk
index 768791b..8f8a5ad 100644 (file)
--- a/util/grind/LLgen.amk
+++ b/util/grind/LLgen.amk
@@ -37,4 +37,3 @@
     exec($cmd, args => if($verbose, {'-vvv'}, {}) + $flags + $src);
     echo({'LLgen ', $src, ' done'});
 };
-

diff --git a/util/grind/tok_tools.amk b/util/grind/tok_tools.amk
index 994c922..48d4cb3 100644 (file)
--- a/util/grind/tok_tools.amk
+++ b/util/grind/tok_tools.amk
@@ -4,7 +4,7 @@ MAKE_TOKCASE = make.tokcase;
 %tool gen_tokens (
     csrc:      %in  [type = C-src, gen_tokens, persistent];
     tokfile:   %out [type = LLgen-src] => get($csrc, LL-dest);
-    symbols:   %out [type = C-src, b]  => get($csrc, cc-dest);
+    symbols:   %out [type = C-src]     => get($csrc, cc-dest);
     mktok:     %in  [type = command]   => $MAKE_TOKFILE;
     mkcase:    %in  [type = command]   => $MAKE_TOKCASE;
 )