COMING ALONG

diff --git a/build-aux/subdirmk-setup b/build-aux/subdirmk-setup
index 257479d32c97d8bba4683a140500ce1b86b6c692..8a41d47195088b585a524e547c656b1abd3749b6 100755 (executable)
--- a/build-aux/subdirmk-setup
+++ b/build-aux/subdirmk-setup
@@ -103,20 +103,20 @@ sub filter_subdir_mk ($$$$$) {
            if ($2) { o $esclit; next; }
            s{^$esc}{} or die "$_ ?";
            if (s{^$esc}{}) { o "$esclit$esclit" }
            if ($2) { o $esclit; next; }
            s{^$esc}{} or die "$_ ?";
            if (s{^$esc}{}) { o "$esclit$esclit" }

-           elsif (s{^TARGETS(?:_[0-9a-zA-Z_]+)?(?=\W)}{}) {
-               my $t = $2 // 'all';
+           elsif (s{^TARGETS(?:_([0-9a-zA-Z_]+))?(?=\W)}{}) {
+               my $t = $1 // 'all';

                o target_varname($var_prefix, $t);
                $targets->{$t}=1;
            }
                o target_varname($var_prefix, $t);
                $targets->{$t}=1;
            }

-           elsif (m{^(?=$caps_re)}) { o "${var_prefix}_" }
+           elsif (m{^(?=$caps_re)}) { o $var_prefix }

            elsif (m{^(?=$lc_re)}) { o $dir_prefix }
            elsif (m{^(?=$lc_re)}) { o $dir_prefix }

-           elsif (s{^_}{}) { o "${var_prefix}_" }
+           elsif (s{^_}{}) { o $var_prefix }

            elsif (s{^/}{}) { o $dir_prefix }
            elsif (s{^=_}{}) { o $var_prefix }
            elsif (s{^=/}{}) { o $dir_name }
            elsif (s{^\^}{}) { o "\$(top_srcdir)${dir_suffix}" }
            elsif (s{^\}}{}) { o "\$(abs_top_srcdir)${dir_suffix}" }
            elsif (s{^/}{}) { o $dir_prefix }
            elsif (s{^=_}{}) { o $var_prefix }
            elsif (s{^=/}{}) { o $dir_name }
            elsif (s{^\^}{}) { o "\$(top_srcdir)${dir_suffix}" }
            elsif (s{^\}}{}) { o "\$(abs_top_srcdir)${dir_suffix}" }

-           elsif (s{^(?:[ \t]+([~^]))?(?=[ \t]){}}{}) {
+           elsif (s{^(?:[ \t]+([~^]))?(?=[ \t])}{}) {

                my $prefix =
                    !$1       ? $dir_prefix                     :
                    $1 eq '~' ? '$(abs_top_srcdir)'.$dir_suffix :
                my $prefix =
                    !$1       ? $dir_prefix                     :
                    $1 eq '~' ? '$(abs_top_srcdir)'.$dir_suffix :


@@ -170,6 +170,8 @@ sub process_subtree ($$) {
     filter_subdir_mk($dir_prefix, $dir_suffix, $dir_name,
                     $var_prefix, \%targets);
 
     filter_subdir_mk($dir_prefix, $dir_suffix, $dir_name,
                     $var_prefix, \%targets);
 

+    o "\n";
+

     my @targets = sort keys %targets;
     foreach my $target (@targets) {
        my $target_varname = target_varname($var_prefix, $target);
     my @targets = sort keys %targets;
     foreach my $target (@targets) {
        my $target_varname = target_varname($var_prefix, $target);

diff --git a/src/Subdir.mk.in b/src/Subdir.mk.in
index 462bd37cd3deb3bb16d73a5fbea5fb02e46465ae..499573932ede494159124a50533dcd4b642dbb06 100644 (file)
--- a/src/Subdir.mk.in
+++ b/src/Subdir.mk.in
@@ -23,7 +23,7 @@
 ### Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 ### MA 02111-1307, USA.
 
 ### Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 ### MA 02111-1307, USA.
 

-&TARGETS_all   += & toy
+&TARGETS       += & toy

 
 &OBJECTS       += & toy.o
 &LIBS          += lib/libtoy.a
 
 &OBJECTS       += & toy.o
 &LIBS          += lib/libtoy.a