=== modified file 'bin/aat.awk'
--- bin/aat.awk	2014-07-09 19:12:25 +0000
+++ bin/aat.awk	2014-07-08 20:27:15 +0000
@@ -74,14 +74,9 @@
 		}
 	}
 
-	if(system("test -f " sh_escape(filename)) != 0) {
-		if("MAKE_CMD" in ENVIRON) {
-			if(system(ENVIRON["MAKE_CMD"] " " sh_escape(filename)) != 0) {
-				die("could not build requested file: " sh_escape(filename) " (" name ") PWD: " PWD)
-			}
-		} else {
-			die("could not find requested file: " sh_escape(filename) " (" name ") PWD: " PWD)
-		}
+	if(system("test -f " sh_escape(filename)) != 0)
+	{
+		die("could not find requested file: " sh_escape(filename) " (" name ") PWD: " PWD)
 	}
 
 	print_dep(filename)
@@ -92,23 +87,12 @@
 	sub(/[ \t].*$/, "", varname)
 	sub(/^[^ \t]+[ \t]+/, "", fname)
 	find_file(fname)
-	insert_comment("start @readinto "varname" "filename" {{{")
 	tok_type=T_AWK
 	while(getline <filename) {
 		gsub(/["\\]/, "\\&", $0)
 		token(varname " = \"" $0 "\\n\"\n")
 	}
 	close(filename)
-	insert_comment("}}} end @readinto "varname" "filename)
-}
-
-function insert_comment(str,    tok_type_prev) {
-	tok_type_prev = tok_type
-	sub(/^/, "# ", str)
-	gsub(/\n/, "\n# ", str)
-	tok_type=T_AWK
-	token(str "\n")
-	tok_type = tok_type_prev
 }
 
 function call_macro(name, args,    file_old) {
@@ -120,36 +104,30 @@
 	# Macro to recursively parse another template
 	if(name == "include"){
 		find_file(args)
-		insert_comment("start @include "filename" {{{")
 		while(getline <filename) {
 			parse_line($0)
 		}
 		close(filename)
-		insert_comment("}}} end @include "filename)
 	}
 
 	# Macro to insert another file as verbatim code
 	else if(name == "awk"){
 		find_file(args)
-		insert_comment("start @awk "filename" {{{")
 		tok_type=T_AWK
 		while(getline <filename) {
 			token($0 "\n")
 		}
 		close(filename)
-		insert_comment("}}} end @awk "filename)
 	}
 
 	# Macro to insert another file as text
 	else if(name == "text"){
 		find_file(args)
-		insert_comment("start @text "filename" {{{")
 		tok_type=T_TEXT
 		while(getline <filename) {
 			token($0 "\n")
 		}
 		close(filename)
-		insert_comment("}}} end @text "filename)
 	}
 
 	# Macro to insert source filename as a variable into produced code

=== modified file 'data.awk'
--- data.awk	2014-07-09 19:12:25 +0000
+++ data.awk	2014-06-29 04:36:32 +0000
@@ -22,14 +22,6 @@
 }
 
 state == 1 {
-	if((varname, "fields") in V) {
-		if(V[varname,"fields"] != $0) {
-			print "data.awk: differing field definition for '"varname"'" >"/dev/stderr"
-			print "previous: '"V[varname,"fields"]"'" >"/dev/stderr"
-			print "current:  '"$0"'" >"/dev/stderr"
-			exit 1
-		}
-	}
 	V[varname,"fields"] = $0
 	state = 2
 	next