move build commands for cbmc/version.h from common to cbmc/Makefile

Author: Daniel Kroening

src/Makefile

@@ -38,6 +38,10 @@ $(patsubst %, %.dir, $(filter-out big-int util, $(DIRS))): util.dir
 
 .PHONY: languages
 .PHONY: clean
+.PHONY: version
+
+version:
+	$(MAKE) $(MAKEARGS) -C cbmc version.h
 
 cpp.dir: ansi-c.dir linking.dir
 
@@ -49,20 +53,21 @@ solvers.dir: util.dir langapi.dir
 
 goto-instrument.dir: languages goto-programs.dir pointer-analysis.dir \
                      goto-symex.dir linking.dir analyses.dir solvers.dir \
-                     json.dir
+                     json.dir version
 
 cbmc.dir: languages solvers.dir goto-symex.dir analyses.dir \
           pointer-analysis.dir goto-programs.dir linking.dir \
-          goto-instrument.dir
+          goto-instrument.dir version
 
 goto-analyzer.dir: languages analyses.dir goto-programs.dir linking.dir \
-                   json.dir goto-instrument.dir
+                   json.dir goto-instrument.dir version
 
 goto-diff.dir: languages goto-programs.dir pointer-analysis.dir \
                linking.dir analyses.dir goto-instrument.dir \
-               solvers.dir json.dir goto-symex.dir
+               solvers.dir json.dir goto-symex.dir version
 
-goto-cc.dir: languages pointer-analysis.dir goto-programs.dir linking.dir
+goto-cc.dir: languages pointer-analysis.dir goto-programs.dir linking.dir \
+             version
 
 # building for a particular directory
 

src/cbmc/Makefile

@@ -59,7 +59,26 @@ LIBS =
 include ../config.inc
 include ../common
 
-CLEANFILES = cbmc$(EXEEXT)
+# get version from git
+GIT_INFO = $(shell git describe --tags --always --dirty || echo "n/a")
+RELEASE_INFO = \#define CBMC_VERSION "$(CBMC_VERSION) ($(GIT_INFO))"
+GIT_INFO_FILE = version.h
+
+$(GIT_INFO_FILE):
+	echo '$(RELEASE_INFO)' > $@
+
+generated_files: $(GIT_INFO_FILE)
+
+cbmc_parse_options$(OBJEXT): $(GIT_INFO_FILE)
+
+# mark the actually generated file as a phony target to enforce a rebuild - but
+# only if the version information has changed!
+KNOWN_RELEASE_INFO = $(shell cat $(GIT_INFO_FILE) 2>/dev/null)
+ifneq ($(RELEASE_INFO), $(KNOWN_RELEASE_INFO))
+.PHONY: $(GIT_INFO_FILE)
+endif
+
+CLEANFILES = cbmc$(EXEEXT) $(GIT_INFO_FILE)
 
 all: cbmc$(EXEEXT)
 

src/common

@@ -227,29 +227,12 @@ OBJ += $(patsubst %.cc, %$(OBJEXT), $(filter %.cc, $(SRC)))
 %.obj:%.c
 	$(CC) $(CP_CFLAGS) /nologo /c /EHsc $< /Fo$@
 
-# get version from git
-GIT_INFO = $(shell git describe --tags --always --dirty || echo "n/a")
-RELEASE_INFO = \#define CBMC_VERSION "$(CBMC_VERSION) ($(GIT_INFO))"
-GIT_INFO_FILE = version.h
-
-$(GIT_INFO_FILE):
-	echo '$(RELEASE_INFO)' > $@
-
-$(filter %_parse_options$(OBJEXT), $(OBJ)): $(GIT_INFO_FILE)
-
-# mark the actually generated file as a phony target to enforce a rebuild - but
-# only of the version information has changed!
-KNOWN_RELEASE_INFO = $(shell cat $(GIT_INFO_FILE) 2>/dev/null)
-ifneq ($(RELEASE_INFO), $(KNOWN_RELEASE_INFO))
-.PHONY: $(GIT_INFO_FILE)
-endif
-
 clean:
 	$(RM) $(patsubst %.cpp, %$(OBJEXT), $(filter %.cpp, $(SRC))) \
 		$(patsubst %.cpp, %$(DEPEXT), $(filter %.cpp, $(SRC))) \
 		$(patsubst %.cc, %$(OBJEXT), $(filter %.cc, $(SRC))) \
 		$(patsubst %.cc, %$(DEPEXT), $(filter %.cc, $(SRC))) \
-		$(CLEANFILES) $(GIT_INFO_FILE)
+		$(CLEANFILES)
 
 .PHONY: first_target clean all
 .PHONY: sources generated_files