[dpdk-dev] [PATCH] mk: factorize config rules

DPDK patches and discussions
 help / color / mirror / Atom feed

* [dpdk-dev] [PATCH] mk: factorize config rules
@ 2014-06-10 13:52 Thomas Monjalon
  2014-06-10 13:59 ` [dpdk-dev] [PATCH v2] " Thomas Monjalon
  0 siblings, 1 reply; 5+ messages in thread
From: Thomas Monjalon @ 2014-06-10 13:52 UTC (permalink / raw)
  To: dev

Error message for missing template is factorized in notemplate rule.

RTE_OUTPUT directory is marked as order-only prerequisite.

Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
 mk/rte.sdkconfig.mk | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk
index 3124dce..d35b83a 100644
--- a/mk/rte.sdkconfig.mk
+++ b/mk/rte.sdkconfig.mk
@@ -51,23 +51,28 @@ INSTALL_TARGETS := $(addsuffix _install,$(INSTALL_CONFIGS))
 showconfigs:
 	@$(foreach CONFIG, $(INSTALL_CONFIGS), echo $(CONFIG);)
 
-.PHONY: config
-ifeq ($(RTE_CONFIG_TEMPLATE),)
-config:
+.PHONY: notemplate
+notemplate:
 	@printf "No template specified. "
 	@echo "Use T=template among the following list:"
 	@$(MAKE) -rR showconfigs | sed 's,^,  ,'
+
+.PHONY: config
+ifeq ($(RTE_CONFIG_TEMPLATE),)
+config: notemplate
 else
 config: $(RTE_OUTPUT)/include/rte_config.h $(RTE_OUTPUT)/Makefile
 	$(Q)$(MAKE) depdirs
 	@echo "Configuration done"
 endif
 
+$(RTE_OUTPUT):
+	mkdir -p $@
+
 ifdef NODOTCONF
 $(RTE_OUTPUT)/.config: ;
 else
-$(RTE_OUTPUT)/.config: $(RTE_CONFIG_TEMPLATE) FORCE
-	@[ -d $(RTE_OUTPUT) ] || mkdir -p $(RTE_OUTPUT)
+$(RTE_OUTPUT)/.config: $(RTE_CONFIG_TEMPLATE) FORCE | $(RTE_OUTPUT)
 	$(Q)if [ "$(RTE_CONFIG_TEMPLATE)" != "" -a -f "$(RTE_CONFIG_TEMPLATE)" ]; then \
 		$(CPP) -undef -P -x assembler-with-cpp \
 		-fdirectives-only -ffreestanding \
@@ -78,11 +83,7 @@ $(RTE_OUTPUT)/.config: $(RTE_CONFIG_TEMPLATE) FORCE
 		fi ; \
 		rm -f $(RTE_OUTPUT)/.config_tmp ; \
 	else \
-		echo -n "No template specified. Use T=template " ; \
-		echo "among the following list:" ; \
-		for t in $(INSTALL_CONFIGS); do \
-			echo "  $$t" ; \
-		done ; \
+		$(MAKE) -rRf $(RTE_SDK)/mk/rte.sdkconfig.mk notemplate; \
 	fi
 endif
 
@@ -92,8 +93,7 @@ SDK_RELPATH=$(shell $(RTE_SDK)/scripts/relpath.sh $(abspath $(RTE_SRCDIR)) \
 				$(abspath $(RTE_OUTPUT)))
 OUTPUT_RELPATH=$(shell $(RTE_SDK)/scripts/relpath.sh $(abspath $(RTE_OUTPUT)) \
 				$(abspath $(RTE_SRCDIR)))
-$(RTE_OUTPUT)/Makefile:
-	@[ -d $(RTE_OUTPUT) ] || mkdir -p $(RTE_OUTPUT)
+$(RTE_OUTPUT)/Makefile: | $(RTE_OUTPUT)
 	$(Q)$(RTE_SDK)/scripts/gen-build-mk.sh $(SDK_RELPATH) $(OUTPUT_RELPATH) \
 		> $(RTE_OUTPUT)/Makefile
 
@@ -103,7 +103,6 @@ $(RTE_OUTPUT)/include/rte_config.h: $(RTE_OUTPUT)/.config
 	$(Q)rm -rf $(RTE_OUTPUT)/include $(RTE_OUTPUT)/app \
 		$(RTE_OUTPUT)/hostapp $(RTE_OUTPUT)/lib \
 		$(RTE_OUTPUT)/hostlib $(RTE_OUTPUT)/kmod $(RTE_OUTPUT)/build
-	@[ -d $(RTE_OUTPUT)/include ] || mkdir -p $(RTE_OUTPUT)/include
 	$(Q)$(RTE_SDK)/scripts/gen-config-h.sh $(RTE_OUTPUT)/.config \
 		> $(RTE_OUTPUT)/include/rte_config.h
 
-- 
2.0.0

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [dpdk-dev] [PATCH v2] mk: factorize config rules
  2014-06-10 13:52 [dpdk-dev] [PATCH] mk: factorize config rules Thomas Monjalon
@ 2014-06-10 13:59 ` Thomas Monjalon
  2014-06-10 14:39   ` [dpdk-dev] [PATCH v3] " Thomas Monjalon
  0 siblings, 1 reply; 5+ messages in thread
From: Thomas Monjalon @ 2014-06-10 13:59 UTC (permalink / raw)
  To: dev

Error message for missing template is factorized in notemplate rule.

RTE_OUTPUT directory is marked as order-only prerequisite.

RTE_OUTPUT is always created after having been cleaned for rte_config.h.

Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
 mk/rte.sdkconfig.mk | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

changes in v2:
- keep RTE_OUTPUT creation for rte_config.h

diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk
index 3124dce..26bd611 100644
--- a/mk/rte.sdkconfig.mk
+++ b/mk/rte.sdkconfig.mk
@@ -51,23 +51,28 @@ INSTALL_TARGETS := $(addsuffix _install,$(INSTALL_CONFIGS))
 showconfigs:
 	@$(foreach CONFIG, $(INSTALL_CONFIGS), echo $(CONFIG);)
 
-.PHONY: config
-ifeq ($(RTE_CONFIG_TEMPLATE),)
-config:
+.PHONY: notemplate
+notemplate:
 	@printf "No template specified. "
 	@echo "Use T=template among the following list:"
 	@$(MAKE) -rR showconfigs | sed 's,^,  ,'
+
+.PHONY: config
+ifeq ($(RTE_CONFIG_TEMPLATE),)
+config: notemplate
 else
 config: $(RTE_OUTPUT)/include/rte_config.h $(RTE_OUTPUT)/Makefile
 	$(Q)$(MAKE) depdirs
 	@echo "Configuration done"
 endif
 
+$(RTE_OUTPUT):
+	mkdir -p $@
+
 ifdef NODOTCONF
 $(RTE_OUTPUT)/.config: ;
 else
-$(RTE_OUTPUT)/.config: $(RTE_CONFIG_TEMPLATE) FORCE
-	@[ -d $(RTE_OUTPUT) ] || mkdir -p $(RTE_OUTPUT)
+$(RTE_OUTPUT)/.config: $(RTE_CONFIG_TEMPLATE) FORCE | $(RTE_OUTPUT)
 	$(Q)if [ "$(RTE_CONFIG_TEMPLATE)" != "" -a -f "$(RTE_CONFIG_TEMPLATE)" ]; then \
 		$(CPP) -undef -P -x assembler-with-cpp \
 		-fdirectives-only -ffreestanding \
@@ -78,11 +83,7 @@ $(RTE_OUTPUT)/.config: $(RTE_CONFIG_TEMPLATE) FORCE
 		fi ; \
 		rm -f $(RTE_OUTPUT)/.config_tmp ; \
 	else \
-		echo -n "No template specified. Use T=template " ; \
-		echo "among the following list:" ; \
-		for t in $(INSTALL_CONFIGS); do \
-			echo "  $$t" ; \
-		done ; \
+		$(MAKE) -rRf $(RTE_SDK)/mk/rte.sdkconfig.mk notemplate; \
 	fi
 endif
 
@@ -92,8 +93,7 @@ SDK_RELPATH=$(shell $(RTE_SDK)/scripts/relpath.sh $(abspath $(RTE_SRCDIR)) \
 				$(abspath $(RTE_OUTPUT)))
 OUTPUT_RELPATH=$(shell $(RTE_SDK)/scripts/relpath.sh $(abspath $(RTE_OUTPUT)) \
 				$(abspath $(RTE_SRCDIR)))
-$(RTE_OUTPUT)/Makefile:
-	@[ -d $(RTE_OUTPUT) ] || mkdir -p $(RTE_OUTPUT)
+$(RTE_OUTPUT)/Makefile: | $(RTE_OUTPUT)
 	$(Q)$(RTE_SDK)/scripts/gen-build-mk.sh $(SDK_RELPATH) $(OUTPUT_RELPATH) \
 		> $(RTE_OUTPUT)/Makefile
 
@@ -103,7 +103,7 @@ $(RTE_OUTPUT)/include/rte_config.h: $(RTE_OUTPUT)/.config
 	$(Q)rm -rf $(RTE_OUTPUT)/include $(RTE_OUTPUT)/app \
 		$(RTE_OUTPUT)/hostapp $(RTE_OUTPUT)/lib \
 		$(RTE_OUTPUT)/hostlib $(RTE_OUTPUT)/kmod $(RTE_OUTPUT)/build
-	@[ -d $(RTE_OUTPUT)/include ] || mkdir -p $(RTE_OUTPUT)/include
+	$(Q)mkdir -p $(RTE_OUTPUT)/include
 	$(Q)$(RTE_SDK)/scripts/gen-config-h.sh $(RTE_OUTPUT)/.config \
 		> $(RTE_OUTPUT)/include/rte_config.h
 
-- 
2.0.0

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [dpdk-dev] [PATCH v3] mk: factorize config rules
  2014-06-10 13:59 ` [dpdk-dev] [PATCH v2] " Thomas Monjalon
@ 2014-06-10 14:39   ` Thomas Monjalon
  2014-06-10 16:24     ` Olivier MATZ
  0 siblings, 1 reply; 5+ messages in thread
From: Thomas Monjalon @ 2014-06-10 14:39 UTC (permalink / raw)
  To: dev

Error message for missing template is factorized in notemplate rule.

RTE_OUTPUT directory is marked as order-only prerequisite.

RTE_OUTPUT is always created after having been cleaned for rte_config.h.

Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
 mk/rte.sdkconfig.mk | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

change in v2:
- keep RTE_OUTPUT creation for rte_config.h
change in v3:
- quiet mkdir

diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk
index 3124dce..14d8051 100644
--- a/mk/rte.sdkconfig.mk
+++ b/mk/rte.sdkconfig.mk
@@ -51,23 +51,28 @@ INSTALL_TARGETS := $(addsuffix _install,$(INSTALL_CONFIGS))
 showconfigs:
 	@$(foreach CONFIG, $(INSTALL_CONFIGS), echo $(CONFIG);)
 
-.PHONY: config
-ifeq ($(RTE_CONFIG_TEMPLATE),)
-config:
+.PHONY: notemplate
+notemplate:
 	@printf "No template specified. "
 	@echo "Use T=template among the following list:"
 	@$(MAKE) -rR showconfigs | sed 's,^,  ,'
+
+.PHONY: config
+ifeq ($(RTE_CONFIG_TEMPLATE),)
+config: notemplate
 else
 config: $(RTE_OUTPUT)/include/rte_config.h $(RTE_OUTPUT)/Makefile
 	$(Q)$(MAKE) depdirs
 	@echo "Configuration done"
 endif
 
+$(RTE_OUTPUT):
+	$(Q)mkdir -p $@
+
 ifdef NODOTCONF
 $(RTE_OUTPUT)/.config: ;
 else
-$(RTE_OUTPUT)/.config: $(RTE_CONFIG_TEMPLATE) FORCE
-	@[ -d $(RTE_OUTPUT) ] || mkdir -p $(RTE_OUTPUT)
+$(RTE_OUTPUT)/.config: $(RTE_CONFIG_TEMPLATE) FORCE | $(RTE_OUTPUT)
 	$(Q)if [ "$(RTE_CONFIG_TEMPLATE)" != "" -a -f "$(RTE_CONFIG_TEMPLATE)" ]; then \
 		$(CPP) -undef -P -x assembler-with-cpp \
 		-fdirectives-only -ffreestanding \
@@ -78,11 +83,7 @@ $(RTE_OUTPUT)/.config: $(RTE_CONFIG_TEMPLATE) FORCE
 		fi ; \
 		rm -f $(RTE_OUTPUT)/.config_tmp ; \
 	else \
-		echo -n "No template specified. Use T=template " ; \
-		echo "among the following list:" ; \
-		for t in $(INSTALL_CONFIGS); do \
-			echo "  $$t" ; \
-		done ; \
+		$(MAKE) -rRf $(RTE_SDK)/mk/rte.sdkconfig.mk notemplate; \
 	fi
 endif
 
@@ -92,8 +93,7 @@ SDK_RELPATH=$(shell $(RTE_SDK)/scripts/relpath.sh $(abspath $(RTE_SRCDIR)) \
 				$(abspath $(RTE_OUTPUT)))
 OUTPUT_RELPATH=$(shell $(RTE_SDK)/scripts/relpath.sh $(abspath $(RTE_OUTPUT)) \
 				$(abspath $(RTE_SRCDIR)))
-$(RTE_OUTPUT)/Makefile:
-	@[ -d $(RTE_OUTPUT) ] || mkdir -p $(RTE_OUTPUT)
+$(RTE_OUTPUT)/Makefile: | $(RTE_OUTPUT)
 	$(Q)$(RTE_SDK)/scripts/gen-build-mk.sh $(SDK_RELPATH) $(OUTPUT_RELPATH) \
 		> $(RTE_OUTPUT)/Makefile
 
@@ -103,7 +103,7 @@ $(RTE_OUTPUT)/include/rte_config.h: $(RTE_OUTPUT)/.config
 	$(Q)rm -rf $(RTE_OUTPUT)/include $(RTE_OUTPUT)/app \
 		$(RTE_OUTPUT)/hostapp $(RTE_OUTPUT)/lib \
 		$(RTE_OUTPUT)/hostlib $(RTE_OUTPUT)/kmod $(RTE_OUTPUT)/build
-	@[ -d $(RTE_OUTPUT)/include ] || mkdir -p $(RTE_OUTPUT)/include
+	$(Q)mkdir -p $(RTE_OUTPUT)/include
 	$(Q)$(RTE_SDK)/scripts/gen-config-h.sh $(RTE_OUTPUT)/.config \
 		> $(RTE_OUTPUT)/include/rte_config.h
 
-- 
2.0.0

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [dpdk-dev] [PATCH v3] mk: factorize config rules
  2014-06-10 14:39   ` [dpdk-dev] [PATCH v3] " Thomas Monjalon
@ 2014-06-10 16:24     ` Olivier MATZ
  2014-06-11  9:55       ` Thomas Monjalon
  0 siblings, 1 reply; 5+ messages in thread
From: Olivier MATZ @ 2014-06-10 16:24 UTC (permalink / raw)
  To: Thomas Monjalon, dev

On 06/10/2014 04:39 PM, Thomas Monjalon wrote:
> Error message for missing template is factorized in notemplate rule.
>
> RTE_OUTPUT directory is marked as order-only prerequisite.
>
> RTE_OUTPUT is always created after having been cleaned for rte_config.h.
>
> Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>

Acked-by Olivier Matz <olivier.matz@6wind.com>

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [dpdk-dev] [PATCH v3] mk: factorize config rules
  2014-06-10 16:24     ` Olivier MATZ
@ 2014-06-11  9:55       ` Thomas Monjalon
  0 siblings, 0 replies; 5+ messages in thread
From: Thomas Monjalon @ 2014-06-11  9:55 UTC (permalink / raw)
  To: Olivier MATZ; +Cc: dev

> > Error message for missing template is factorized in notemplate rule.
> >
> > RTE_OUTPUT directory is marked as order-only prerequisite.
> >
> > RTE_OUTPUT is always created after having been cleaned for rte_config.h.
> >
> > Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
> 
> Acked-by Olivier Matz <olivier.matz@6wind.com>

Applied for version 1.7.0.

-- 
Thomas

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2014-06-11  9:54 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-10 13:52 [dpdk-dev] [PATCH] mk: factorize config rules Thomas Monjalon
2014-06-10 13:59 ` [dpdk-dev] [PATCH v2] " Thomas Monjalon
2014-06-10 14:39   ` [dpdk-dev] [PATCH v3] " Thomas Monjalon
2014-06-10 16:24     ` Olivier MATZ
2014-06-11  9:55       ` Thomas Monjalon

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).