subdirmk: break out subdirmk_target in generated Makefile

[subdirmk.git] / generate

diff --git a/generate b/generate
index 178754614ea417bcf9e4d319482615f93dd55a5d..22e8aff57e36abf60d977acebd89ddeebaa91236 100755 (executable)
--- a/generate
+++ b/generate
@@ -99,12 +99,13 @@ sub write_makefile ($$) {
     my $cd = $depth ? join('/', ('..',) x $depth) : '.';
     o <<END;
 default: all
     my $cd = $depth ? join('/', ('..',) x $depth) : '.';
     o <<END;
 default: all

-\$(MAKECMDGOALS) all: FORCE-ALWAYS-RUN
+\$(filter-out all,\$(MAKECMDGOALS)) all: run-main.mk

        \@:
        \@:

-Makefile FORCE-ALWAYS-RUN:
-       \$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(or \$(MAKECMDGOALS),all))
+subdirmk_targets:=\$(or \$(MAKECMDGOALS),all)
+Makefile run-main.mk:
+       \$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(subdirmk_targets))

 .SUFFIXES:
 .SUFFIXES:

-.PHONY:        FORCE-ALWAYS-RUN
+.PHONY:        run-main.mk

 END
 }
 
 END
 }