subdirmk: break out subdirmk_target in generated Makefile

[subdirmk.git] / generate

diff --git a/generate b/generate
index dd22146339b130fc6ffbb7efdd9ab3ce0ccc8515..22e8aff57e36abf60d977acebd89ddeebaa91236 100755 (executable)
--- a/generate
+++ b/generate
@@ -99,10 +99,11 @@ sub write_makefile ($$) {
     my $cd = $depth ? join('/', ('..',) x $depth) : '.';
     o <<END;
 default: all
-\$(MAKECMDGOALS) all: run-main.mk
+\$(filter-out all,\$(MAKECMDGOALS)) all: run-main.mk
        \@:
+subdirmk_targets:=\$(or \$(MAKECMDGOALS),all)
 Makefile run-main.mk:
-       \$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(or \$(MAKECMDGOALS),all))
+       \$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(subdirmk_targets))
 .SUFFIXES:
 .PHONY:        run-main.mk
 END