Update lookup tables with new location of .gperf files

diff --git a/dev.mk.in b/dev.mk.in
index 2a3e6fd49dcc4036608ee268dce3b330ffddb0be..6a20c9e9597d4a0c6f7c6a016246ed0c2deae830 100644 (file)
--- a/dev.mk.in
+++ b/dev.mk.in
@@ -102,7 +102,7 @@ version.o: version.c
 
 %_lookup.c: %.gperf
        $(GPERF) $< | awk '/#ifdef __GNUC__/ { ++i; if (i == 2) { print "static"; }} {print}' >$@
-       echo "static const size_t `echo $* | tr a-z A-Z`_TOTAL_KEYWORDS = `sed -nr 's/.*TOTAL_KEYWORDS = ([0-9]+).*/\1/p' $@`;" >>$@
+       echo "static const size_t $$(echo $(notdir $*) | tr a-z A-Z)_TOTAL_KEYWORDS = $$(sed -nr 's/.*TOTAL_KEYWORDS = ([0-9]+).*/\1/p' $@);" >>$@
 
 .PHONY: dist
 dist: $(dist_archives)

diff --git a/src/confitems_lookup.c b/src/confitems_lookup.c
index 74825575b322c8cbaf070d87d7e2e8b4c0c9461d..63f0da0900b5fa29b3493c0b2e1d9e499e14f54e 100644 (file)
--- a/src/confitems_lookup.c
+++ b/src/confitems_lookup.c
@@ -1,5 +1,5 @@
 /* ANSI-C code produced by gperf version 3.0.4 */
-/* Command-line: gperf confitems.gperf  */
+/* Command-line: gperf src/confitems.gperf  */
 /* Computed positions: -k'1-2' */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -29,7 +29,7 @@
 #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
 #endif
 
-#line 8 "confitems.gperf"
+#line 8 "src/confitems.gperf"
 struct conf_item;
 /* maximum key range = 46, duplicates = 0 */
 
@@ -98,79 +98,79 @@ confitems_get (register const char *str, register unsigned int len)
     {
       {"",0,NULL,0,NULL}, {"",0,NULL,0,NULL},
       {"",0,NULL,0,NULL}, {"",0,NULL,0,NULL},
-#line 29 "confitems.gperf"
+#line 29 "src/confitems.gperf"
       {"path",                19, ITEM(path, env_string)},
       {"",0,NULL,0,NULL}, {"",0,NULL,0,NULL},
       {"",0,NULL,0,NULL},
-#line 13 "confitems.gperf"
+#line 13 "src/confitems.gperf"
       {"compiler",             3, ITEM(compiler, string)},
-#line 11 "confitems.gperf"
+#line 11 "src/confitems.gperf"
       {"cache_dir",            1, ITEM(cache_dir, env_string)},
       {"",0,NULL,0,NULL},
-#line 15 "confitems.gperf"
+#line 15 "src/confitems.gperf"
       {"compression",          5, ITEM(compression, bool)},
       {"",0,NULL,0,NULL},
-#line 17 "confitems.gperf"
+#line 17 "src/confitems.gperf"
       {"cpp_extension",        7, ITEM(cpp_extension, string)},
-#line 14 "confitems.gperf"
+#line 14 "src/confitems.gperf"
       {"compiler_check",       4, ITEM(compiler_check, string)},
-#line 37 "confitems.gperf"
+#line 37 "src/confitems.gperf"
       {"stats",               27, ITEM(stats, bool)},
-#line 12 "confitems.gperf"
+#line 12 "src/confitems.gperf"
       {"cache_dir_levels",     2, ITEM_V(cache_dir_levels, unsigned, dir_levels)},
-#line 16 "confitems.gperf"
+#line 16 "src/confitems.gperf"
       {"compression_level",    6, ITEM(compression_level, unsigned)},
-#line 26 "confitems.gperf"
+#line 26 "src/confitems.gperf"
       {"log_file",            16, ITEM(log_file, env_string)},
-#line 30 "confitems.gperf"
+#line 30 "src/confitems.gperf"
       {"prefix_command",      20, ITEM(prefix_command, env_string)},
-#line 36 "confitems.gperf"
+#line 36 "src/confitems.gperf"
       {"sloppiness",          26, ITEM(sloppiness, sloppiness)},
-#line 10 "confitems.gperf"
+#line 10 "src/confitems.gperf"
       {"base_dir",             0, ITEM_V(base_dir, env_string, absolute_path)},
-#line 34 "confitems.gperf"
+#line 34 "src/confitems.gperf"
       {"recache",             24, ITEM(recache, bool)},
-#line 31 "confitems.gperf"
+#line 31 "src/confitems.gperf"
       {"prefix_command_cpp",  21, ITEM(prefix_command_cpp, env_string)},
-#line 32 "confitems.gperf"
+#line 32 "src/confitems.gperf"
       {"read_only",           22, ITEM(read_only, bool)},
-#line 40 "confitems.gperf"
+#line 40 "src/confitems.gperf"
       {"unify",               30, ITEM(unify, bool)},
       {"",0,NULL,0,NULL},
-#line 24 "confitems.gperf"
+#line 24 "src/confitems.gperf"
       {"keep_comments_cpp",   14, ITEM(keep_comments_cpp, bool)},
-#line 28 "confitems.gperf"
+#line 28 "src/confitems.gperf"
       {"max_size",            18, ITEM(max_size, size)},
-#line 27 "confitems.gperf"
+#line 27 "src/confitems.gperf"
       {"max_files",           17, ITEM(max_files, unsigned)},
       {"",0,NULL,0,NULL},
-#line 33 "confitems.gperf"
+#line 33 "src/confitems.gperf"
       {"read_only_direct",    23, ITEM(read_only_direct, bool)},
-#line 19 "confitems.gperf"
+#line 19 "src/confitems.gperf"
       {"disable",              9, ITEM(disable, bool)},
-#line 38 "confitems.gperf"
+#line 38 "src/confitems.gperf"
       {"temporary_dir",       28, ITEM(temporary_dir, env_string)},
-#line 35 "confitems.gperf"
+#line 35 "src/confitems.gperf"
       {"run_second_cpp",      25, ITEM(run_second_cpp, bool)},
       {"",0,NULL,0,NULL},
-#line 18 "confitems.gperf"
+#line 18 "src/confitems.gperf"
       {"direct_mode",          8, ITEM(direct_mode, bool)},
       {"",0,NULL,0,NULL},
-#line 22 "confitems.gperf"
+#line 22 "src/confitems.gperf"
       {"hash_dir",            12, ITEM(hash_dir, bool)},
-#line 21 "confitems.gperf"
+#line 21 "src/confitems.gperf"
       {"hard_link",           11, ITEM(hard_link, bool)},
-#line 39 "confitems.gperf"
+#line 39 "src/confitems.gperf"
       {"umask",               29, ITEM(umask, umask)},
       {"",0,NULL,0,NULL}, {"",0,NULL,0,NULL},
       {"",0,NULL,0,NULL},
-#line 25 "confitems.gperf"
+#line 25 "src/confitems.gperf"
       {"limit_multiple",      15, ITEM(limit_multiple, float)},
       {"",0,NULL,0,NULL},
-#line 23 "confitems.gperf"
+#line 23 "src/confitems.gperf"
       {"ignore_headers_in_manifest", 13, ITEM(ignore_headers_in_manifest, env_string)},
       {"",0,NULL,0,NULL}, {"",0,NULL,0,NULL},
-#line 20 "confitems.gperf"
+#line 20 "src/confitems.gperf"
       {"extra_files_to_hash", 10, ITEM(extra_files_to_hash, env_string)}
     };
 

diff --git a/src/envtoconfitems_lookup.c b/src/envtoconfitems_lookup.c
index 1265bd6e6d221bca953d5cfdf64752bdd426d504..690ed94f56fcf287ead6416426019a7e00ccf23b 100644 (file)
--- a/src/envtoconfitems_lookup.c
+++ b/src/envtoconfitems_lookup.c
@@ -1,5 +1,5 @@
 /* ANSI-C code produced by gperf version 3.0.4 */
-/* Command-line: gperf envtoconfitems.gperf  */
+/* Command-line: gperf src/envtoconfitems.gperf  */
 /* Computed positions: -k'1,5' */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -29,7 +29,7 @@
 #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
 #endif
 
-#line 9 "envtoconfitems.gperf"
+#line 9 "src/envtoconfitems.gperf"
 struct env_to_conf_item;
 /* maximum key range = 42, duplicates = 0 */
 
@@ -111,77 +111,77 @@ envtoconfitems_get (register const char *str, register unsigned int len)
   static const struct env_to_conf_item wordlist[] =
     {
       {"",""}, {"",""},
-#line 12 "envtoconfitems.gperf"
+#line 12 "src/envtoconfitems.gperf"
       {"CC", "compiler"},
-#line 18 "envtoconfitems.gperf"
+#line 18 "src/envtoconfitems.gperf"
       {"DIR", "cache_dir"},
-#line 16 "envtoconfitems.gperf"
+#line 16 "src/envtoconfitems.gperf"
       {"CPP2", "run_second_cpp"},
       {"",""},
-#line 19 "envtoconfitems.gperf"
+#line 19 "src/envtoconfitems.gperf"
       {"DIRECT", "direct_mode"},
-#line 20 "envtoconfitems.gperf"
+#line 20 "src/envtoconfitems.gperf"
       {"DISABLE", "disable"},
-#line 17 "envtoconfitems.gperf"
+#line 17 "src/envtoconfitems.gperf"
       {"COMMENTS", "keep_comments_cpp"},
-#line 31 "envtoconfitems.gperf"
+#line 31 "src/envtoconfitems.gperf"
       {"PATH", "path"},
-#line 41 "envtoconfitems.gperf"
+#line 41 "src/envtoconfitems.gperf"
       {"UNIFY", "unify"},
-#line 32 "envtoconfitems.gperf"
+#line 32 "src/envtoconfitems.gperf"
       {"PREFIX", "prefix_command"},
-#line 36 "envtoconfitems.gperf"
+#line 36 "src/envtoconfitems.gperf"
       {"RECACHE", "recache"},
-#line 13 "envtoconfitems.gperf"
+#line 13 "src/envtoconfitems.gperf"
       {"COMPILERCHECK", "compiler_check"},
       {"",""},
-#line 33 "envtoconfitems.gperf"
+#line 33 "src/envtoconfitems.gperf"
       {"PREFIX_CPP", "prefix_command_cpp"},
-#line 30 "envtoconfitems.gperf"
+#line 30 "src/envtoconfitems.gperf"
       {"NLEVELS", "cache_dir_levels"},
-#line 27 "envtoconfitems.gperf"
+#line 27 "src/envtoconfitems.gperf"
       {"LOGFILE", "log_file"},
-#line 34 "envtoconfitems.gperf"
+#line 34 "src/envtoconfitems.gperf"
       {"READONLY", "read_only"},
-#line 21 "envtoconfitems.gperf"
+#line 21 "src/envtoconfitems.gperf"
       {"EXTENSION", "cpp_extension"},
-#line 40 "envtoconfitems.gperf"
+#line 40 "src/envtoconfitems.gperf"
       {"UMASK", "umask"},
       {"",""},
-#line 24 "envtoconfitems.gperf"
+#line 24 "src/envtoconfitems.gperf"
       {"HASHDIR", "hash_dir"},
-#line 14 "envtoconfitems.gperf"
+#line 14 "src/envtoconfitems.gperf"
       {"COMPRESS", "compression"},
       {"",""},
-#line 35 "envtoconfitems.gperf"
+#line 35 "src/envtoconfitems.gperf"
       {"READONLY_DIRECT", "read_only_direct"},
       {"",""},
-#line 39 "envtoconfitems.gperf"
+#line 39 "src/envtoconfitems.gperf"
       {"TEMPDIR", "temporary_dir"},
-#line 15 "envtoconfitems.gperf"
+#line 15 "src/envtoconfitems.gperf"
       {"COMPRESSLEVEL", "compression_level"},
-#line 26 "envtoconfitems.gperf"
+#line 26 "src/envtoconfitems.gperf"
       {"LIMIT_MULTIPLE", "limit_multiple"},
-#line 38 "envtoconfitems.gperf"
+#line 38 "src/envtoconfitems.gperf"
       {"STATS", "stats"},
       {"",""},
-#line 29 "envtoconfitems.gperf"
+#line 29 "src/envtoconfitems.gperf"
       {"MAXSIZE", "max_size"},
-#line 28 "envtoconfitems.gperf"
+#line 28 "src/envtoconfitems.gperf"
       {"MAXFILES", "max_files"},
       {"",""},
-#line 37 "envtoconfitems.gperf"
+#line 37 "src/envtoconfitems.gperf"
       {"SLOPPINESS", "sloppiness"},
       {"",""},
-#line 11 "envtoconfitems.gperf"
+#line 11 "src/envtoconfitems.gperf"
       {"BASEDIR", "base_dir"},
-#line 23 "envtoconfitems.gperf"
+#line 23 "src/envtoconfitems.gperf"
       {"HARDLINK", "hard_link"},
       {"",""},
-#line 22 "envtoconfitems.gperf"
+#line 22 "src/envtoconfitems.gperf"
       {"EXTRAFILES", "extra_files_to_hash"},
       {"",""}, {"",""},
-#line 25 "envtoconfitems.gperf"
+#line 25 "src/envtoconfitems.gperf"
       {"IGNOREHEADERS", "ignore_headers_in_manifest"}
     };