[iproute2-next] config.mk: Rerun configure when it is newer than config.mk

Message ID 20210515201320.7435-1-dsahern@kernel.org
State New
Headers show
Series
  • [iproute2-next] config.mk: Rerun configure when it is newer than config.mk
Related show

Commit Message

David Ahern May 15, 2021, 8:13 p.m.
config.mk needs to be re-generated any time configure is changed.
Rename the existing make target and add a check that the config.mk
file needs to exist and must be newer than configure script.

Signed-off-by: David Ahern <dsahern@kernel.org>
Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
---
 Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Comments

Petr Vorel May 15, 2021, 8:16 p.m. | #1
Hi David,

> config.mk needs to be re-generated any time configure is changed.
> Rename the existing make target and add a check that the config.mk
> file needs to exist and must be newer than configure script.

> Signed-off-by: David Ahern <dsahern@kernel.org>
> Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
Tested-by: Petr Vorel <petr.vorel@gmail.com>

Thanks!

Kind regards,
Petr

> ---
>  Makefile | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)

> diff --git a/Makefile b/Makefile
> index 19bd163e2e04..5bc11477ab7a 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -60,7 +60,7 @@ SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma dcb man vdpa
>  LIBNETLINK=../lib/libutil.a ../lib/libnetlink.a
>  LDLIBS += $(LIBNETLINK)

> -all: config.mk
> +all: config
>  	@set -e; \
>  	for i in $(SUBDIRS); \
>  	do echo; echo $$i; $(MAKE) -C $$i; done
> @@ -80,8 +80,10 @@ all: config.mk
>  	@echo "Make Arguments:"
>  	@echo " V=[0|1]             - set build verbosity level"

> -config.mk:
> -	sh configure $(KERNEL_INCLUDE)
> +config:
> +	@if [ ! -f config.mk -o configure -nt config.mk ]; then \
> +		sh configure $(KERNEL_INCLUDE); \
> +	fi

>  install: all
>  	install -m 0755 -d $(DESTDIR)$(SBINDIR)

Patch

diff --git a/Makefile b/Makefile
index 19bd163e2e04..5bc11477ab7a 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@  SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma dcb man vdpa
 LIBNETLINK=../lib/libutil.a ../lib/libnetlink.a
 LDLIBS += $(LIBNETLINK)
 
-all: config.mk
+all: config
 	@set -e; \
 	for i in $(SUBDIRS); \
 	do echo; echo $$i; $(MAKE) -C $$i; done
@@ -80,8 +80,10 @@  all: config.mk
 	@echo "Make Arguments:"
 	@echo " V=[0|1]             - set build verbosity level"
 
-config.mk:
-	sh configure $(KERNEL_INCLUDE)
+config:
+	@if [ ! -f config.mk -o configure -nt config.mk ]; then \
+		sh configure $(KERNEL_INCLUDE); \
+	fi
 
 install: all
 	install -m 0755 -d $(DESTDIR)$(SBINDIR)