Commit 25a1acd8 authored by Kir Kolyshkin's avatar Kir Kolyshkin Committed by Pavel Emelyanov

nmk/script: rm bad code

I discovered that the scripts/ suffix is added to __nmk_dir despite
the fact it already contains it, ending in obviously wrong filenames
like scripts/nmk/scripts/scripts/msg.mk. As those files are non-existent,
make tried to recreate every .mk file, spawninga child to execute 'true'
command, like this (part of "make -dr" output):

> Considering target file '../scripts/nmk/scripts/scripts/include.mk'.
>  File '../scripts/nmk/scripts/scripts/include.mk' does not exist.
>  Finished prerequisites of target file
> '../scripts/nmk/scripts/scripts/include.mk'.
> Must remake target '../scripts/nmk/scripts/scripts/include.mk'.
> Putting child 0x564ec1768740 (../scripts/nmk/scripts/scripts/include.mk)
> PID 21633 on the chain.
> Live child 0x564ec1768740 (../scripts/nmk/scripts/scripts/include.mk)
> PID 21633
> Reaping winning child 0x564ec1768740 PID 21633
> Removing child 0x564ec1768740 PID 21633 from chain.

The fix was to remove the extra scripts/, but once I did it, I found
out problem #2: these targets, being defined in contents that is often
included in the beginning of Makefiles, hijacks the default make
target (the first one in the Makefile), breaking the usual and
expected make behavior, and forcing to use .DEFAULT_GOAL.

Finally, I don't know why these targets are there, i.e. what purpose
do they serve. Maybe it was done to exclude any implicit rules to
re-make those files, but there are no such rules as far as I can see.

So, in order to address problem #2, I have removed these targets.
I don't see any harm in doing that; let me know if it breaks anything.

Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarKir Kolyshkin <kir@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent 9e2ce61c
...@@ -284,7 +284,5 @@ mrproper: clean ...@@ -284,7 +284,5 @@ mrproper: clean
# #
# Footer. # Footer.
$(__nmk_dir)scripts/build.mk:
@true
____nmk_defined__build = y ____nmk_defined__build = y
endif endif
...@@ -52,7 +52,5 @@ export build-as ...@@ -52,7 +52,5 @@ export build-as
# #
# Footer. # Footer.
$(__nmk_dir)scripts/include.mk:
@true
____nmk_defined__include = y ____nmk_defined__include = y
endif endif
...@@ -29,7 +29,5 @@ endef ...@@ -29,7 +29,5 @@ endef
# #
# Footer. # Footer.
$(__nmk_dir)scripts/macro.mk:
@true
____nmk_defined__macro = y ____nmk_defined__macro = y
endif endif
...@@ -24,7 +24,5 @@ $(eval $(call include-once,build.mk)) ...@@ -24,7 +24,5 @@ $(eval $(call include-once,build.mk))
# #
# Footer # Footer
$(__nmk_dir)scripts/main.mk:
@true
____nmk_defined__main = y ____nmk_defined__main = y
endif endif
...@@ -67,7 +67,5 @@ map = $(foreach x,$2,$(call $1,$x)$(newline)) ...@@ -67,7 +67,5 @@ map = $(foreach x,$2,$(call $1,$x)$(newline))
# #
# Footer. # Footer.
$(__nmk_dir)scripts/msg.mk:
@true
____nmk_defined__msg = y ____nmk_defined__msg = y
endif #____nmk_defined__msg endif #____nmk_defined__msg
...@@ -30,7 +30,5 @@ export NM SH MAKE MKDIR AWK PERL PYTHON SH CSCOPE ...@@ -30,7 +30,5 @@ export NM SH MAKE MKDIR AWK PERL PYTHON SH CSCOPE
# #
# Footer. # Footer.
$(__nmk_dir)scripts/tools.mk:
@true
____nmk_defined__tools = y ____nmk_defined__tools = y
endif endif
...@@ -23,7 +23,5 @@ cleanify = $(foreach o,$(sort $(call uniq,$(1))),$(o) $(o:.o=.d) $(o:.o=.i) $(o: ...@@ -23,7 +23,5 @@ cleanify = $(foreach o,$(sort $(call uniq,$(1))),$(o) $(o:.o=.d) $(o:.o=.i) $(o:
# #
# Footer. # Footer.
$(__nmk_dir)scripts/utils.mk:
@true
____nmk_defined__utils = y ____nmk_defined__utils = y
endif endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment