bld: put common building variables in common.mk

Signed-off-by: Federico Vaga <federico.vaga@cern.ch>

bld: put common building variables in common.mk
Signed-off-by: Federico Vaga <federico.vaga@cern.ch>
8fc00910 · Federico Vaga · 68fcb2c2 · 8fc00910 · 8fc00910 · 8fc00910
Commit 8fc00910 authored Oct 21, 2019 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 12 deletions

common.mk common.mk +6 -0

Makefile software/Makefile +4 -2

Makefile software/lib/Makefile +5 -5

Makefile software/tools/Makefile +4 -5

No files found.
--- a/common.mk
+++ b/common.mk
+PREFIX ?= /
+
+GIT_VERSION = $(shell cd $(TRTL); git describe --always --dirty --long --tags)
+VERSION:= $(shell git describe --tags --abbrev=0 | tr -d 'v')
+
+TRTL_SW := $(TRTL)/software
--- a/software/Makefile
+++ b/software/Makefile
@@ -9,7 +9,9 @@ CURDIR:=$(shell /bin/pwd)
 REPO_PARENT ?= $(CURDIR)/..
 -include $(REPO_PARENT)/parent_common.mk

-PREFIX ?= /
+TOP_DIR ?= $(shell pwd)/../
+TRTL ?= $(TOP_DIR)
+include $(TRTL)/common.mk

 DIRS = kernel lib tools include

@@ -20,7 +22,7 @@ kernel lib: headers
 tools: lib

 .PHONY: all clean modules install modules_install $(DIRS)
-.PHONY: gitmodules prereq_install prereq_install_warn
+.PHONY: prereq_install prereq_install_warn
 .PHONY: gtags headers

 install modules_install: prereq_install_warn

--- a/software/lib/Makefile
+++ b/software/lib/Makefile
@@ -11,14 +11,14 @@
 REPO_PARENT ?= ../..
 -include $(REPO_PARENT)/parent_common.mk

-GIT_VERSION := $(shell git describe --dirty --long --tags)
-SO_VERSION_XYZ := $(shell git describe --abbrev=0 | grep -o -E "[0-9]+\.[0-9]+\.[0-9]")
+TOP_DIR ?= $(shell pwd)/../../
+TRTL ?= $(TOP_DIR)
+include $(TRTL)/common.mk
+
+SO_VERSION_XYZ := $(shell echo $(VERSION) | grep -o -E "[0-9]+\.[0-9]+\.[0-9]")
 SO_VERSION_X := $(shell echo $(SO_VERSION_XYZ) | cut -d "." -f 1)

-PREFIX ?= /
 DESTLIBDIR ?= $(PREFIX)/usr/local/lib
-TRTL ?= ../..
-TRTL_SW = $(TRTL)/software

 LIBS = libmockturtle.so
 LIBS_XYZ = $(LIBS).$(SO_VERSION_XYZ)

--- a/software/tools/Makefile
+++ b/software/tools/Makefile
@@ -11,12 +11,11 @@
 REPO_PARENT ?= ../..
 -include $(REPO_PARENT)/parent_common.mk

-PREFIX ?= /
-BINDESTDIR ?= $(PREFIX)/usr/local/bin
-TRTL ?= ../..
-TRTL_SW = $(TRTL)/software
+TOP_DIR ?= $(shell pwd)/../../
+TRTL ?= $(TOP_DIR)
+include $(TRTL)/common.mk

-GIT_VERSION := $(shell git describe --dirty --long --tags)
+BINDESTDIR ?= $(PREFIX)/usr/local/bin

 CFLAGS += -Wall -Werror
 CFLAGS += -I$(TRTL_SW)/include