From 85aa7118467ccb8abacc8ede41dcd5011ab84fad Mon Sep 17 00:00:00 2001 From: bernie Date: Mon, 4 Aug 2008 11:15:05 +0000 Subject: [PATCH] Replace a $(shell ...) by folding the check for existance of bertos/verstag.c inside the bumprev rule. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1533 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/rules.mk | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/bertos/rules.mk b/bertos/rules.mk index 23d988f7..d3cde94b 100644 --- a/bertos/rules.mk +++ b/bertos/rules.mk @@ -279,23 +279,20 @@ $(RECURSIVE_TARGETS): BUILDREV_H = buildrev.h -ifeq ($(shell [ -e bertos/verstag.c ] && echo yes),yes) .PHONY: bumprev bumprev: - @buildnr=0; \ - if [ -f $(BUILDREV_H) ]; then \ - buildnr=`sed <"$(BUILDREV_H)" -n -e 's/#define VERS_BUILD \([0-9][0-9]*\)/\1/p'`; \ + @if [ -e bertos/verstag.c ]; then \ + buildnr=0; \ + if [ -f $(BUILDREV_H) ]; then \ + buildnr=`sed <"$(BUILDREV_H)" -n -e 's/#define VERS_BUILD \([0-9][0-9]*\)/\1/p'`; \ + fi; \ + buildnr=`expr $$buildnr + 1`; \ + buildhost=`hostname | sed -n -e '1h;2,$$H;$${g;s/\n//g;p;}'`; \ + echo "#define VERS_BUILD $$buildnr" >"$(BUILDREV_H)"; \ + echo "#define VERS_HOST \"$$buildhost\"" >>"$(BUILDREV_H)"; \ + echo "Building revision $$buildnr"; \ fi; \ - buildnr=`expr $$buildnr + 1`; \ - buildhost=`hostname | sed -n -e '1h;2,$$H;$${g;s/\n//g;p;}'`; \ - echo "#define VERS_BUILD $$buildnr" >"$(BUILDREV_H)"; \ - echo "#define VERS_HOST \"$$buildhost\"" >>"$(BUILDREV_H)"; \ - echo "Building revision $$buildnr" -else -.PHONY: bumprev -bumprev: - -endif + # # Include dependencies ifneq ($(strip $(OBJ)),) -- 2.25.1