WIP

diff --git a/.gitignore b/.gitignore
index 0e76771f36ddac0f10e9f79d8b601e48bce1f8d3..60b28ffb583cb44b46dbb37e6bf2e4d3bb059ed4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,12 +7,15 @@
 /src/toy
 
 ## Autoconf cruft.
-Makefile
-Subdir.mk
-/subdirs.mk
-*.tmp
 
 /autom4te.cache/
 /config.log
 /config.status
 /configure
+
+## subdirmk-generated
+/main.mk
+/subdirmk/regen.mk
+Makefile
+Subdir.mk
+*.tmp

diff --git a/Subdir.mk.in b/Subdir.mk.in
index ef342802ad52f25477035edb2e318b810802efd0..79249db459f8b329ed10abb7115d3c385d5abb8b 100644 (file)
--- a/Subdir.mk.in
+++ b/Subdir.mk.in
@@ -22,3 +22,5 @@ COMPILE               ?= $(CC) -c -o$@ -MD $(DEFS) $(INCLUDES) $(CFLAGS)
 
 %.o: %.c
        $(COMPILE) $<
+
+include &^/subdirmk/regen.mk

diff --git a/subdirmk/autogen.sh b/subdirmk/autogen.sh
new file mode 100755 (executable)
index 0000000..5658c0a
--- /dev/null
+++ b/subdirmk/autogen.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+set -e
+autoconf

diff --git a/subdirmk/generate b/subdirmk/generate
index 857e768cd494b317ba14b0f8851fbec11362c787..312b4880f1461b4e6c35a6c516230d74466811a4 100755 (executable)
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -115,7 +115,7 @@ sub filter_subdir_mk ($$$$$) {
            elsif (s{^TARGETS(?:_([0-9a-zA-Z_]+))?(?=\W)}{}) {
                my $t = $1 // 'all';
                o target_varname($var_prefix, $t);
-               $targets->{$t}=1;
+               $targets->{$t} //= [ ];
            }
            elsif (m{^(?=$caps_re)}) { o $var_prefix }
            elsif (m{^(?=$lc_re)}) { o $dir_prefix }
@@ -168,12 +168,11 @@ sub process_subtree ($$) {
 
     write_makefile($dir_prefix, scalar @$path);
 
-    my %targets = qw(all 1);
-    my @child_subdirs;
+    my %targets = (all => []);
     foreach my $child (@{ $node->[1] }) {
        my @childpath = (@$path, $child->[0]);
-       push @child_subdirs, join '/', @childpath;
-       $targets{$_}++ foreach
+       my $child_subdir = join '/', @childpath;
+       push @{ $targets{$_} }, $child_subdir foreach
            process_subtree($child, \@childpath);
     }
     start_output_file("${dir_prefix}Subdir.mk.tmp");
@@ -187,7 +186,7 @@ sub process_subtree ($$) {
     foreach my $target (@targets) {
        my $target_varname = target_varname($var_prefix, $target);
        print O "${dir_prefix}${target}: \$($target_varname)";
-       foreach my $child_subdir (@child_subdirs) {
+       foreach my $child_subdir (@{ $targets{$target} }) {
            print O " $child_subdir/$target";
        }
        print O "\n";

diff --git a/subdirmk/regen.mk.in b/subdirmk/regen.mk.in
index 0e8bb6a3245ddc82e8508a7119848c813da4e6da..81739b9180e1ac72863eace9ca725841ab7ab349 100644 (file)
--- a/subdirmk/regen.mk.in
+++ b/subdirmk/regen.mk.in
@@ -2,16 +2,19 @@
 CONFIGURE      ?= configure
 CONFIGURE_AC   ?= $(CONFIGURE).ac
 CONFIG_STATUS  ?= config.status
-SUBDIRMK       ?= subdirmk
 
-&^/$(CONFIGURE): &^/$(CONFIGURE_AC)
+$(top_srcdir)/$(CONFIGURE): $(top_srcdir)/$(CONFIGURE_AC)
        cd &^ && autoconf
 
-$(CONFIG_STATUS): &^/$(CONFIGURE)
+$(CONFIG_STATUS): $(top_srcdir)/$(CONFIGURE)
        ./$(CONFIG_STATUS) --recheck
 
-all-subdirs.mk $(MAKFILES): makefiles.phantom
+MAKEFILES += subdirmk/regen.mk
+
+main.mk $(MAKFILES): makefiles.phantom
 .INTERMEDIATE: makefiles.phantom
-makefiles.phantom: $(addprefix &^/,$(addsuffix .in,$(MAKEFILES)))      \
-               $(CONFIG_STATUS) &^/$(SUBDIRMK)/generate
+makefiles.phantom:                                             \
+               $(top_srcdir)/subdirmk/generate                 \
+               $(CONFIG_STATUS)                                \
+               $(foreach m,$(MAKEFILES),$(top_srcdir)/$(m).in)
        ./$(CONFIG_STATUS)

diff --git a/subdirmk/subdirmk.ac b/subdirmk/subdirmk.ac
index 43963df4172d67936fd37fc640bf09c5cc34d41f..24e6d14fa5a772a3bfa8c1a1c48dadf91d7d84a9 100644 (file)
--- a/subdirmk/subdirmk.ac
+++ b/subdirmk/subdirmk.ac
@@ -3,7 +3,11 @@ AC_DEFUN([SUBDIRMK_SUBDIRS],
 [m4_map_args_w([$1],[_SUBDIRMK_SUBDIR(],[/)])])dnl
 
 AC_DEFUN_ONCE([_SUBDIRMK_INIT],[
-  AC_CONFIG_FILES([main.mk:main.mk.tmp Subdir.mk:Subdir.mk.tmp],[],[
+  AC_CONFIG_FILES([
+       main.mk:main.mk.tmp
+       Subdir.mk:Subdir.mk.tmp
+       subdirmk/regen.mk
+       ],[],[
     subdirsmk_need_prep=false
     AS_IF([\$ac_need_defaults],[
       subdirsmk_need_prep=true],[