sw: consinstent use of TRTL build env variable

In some Makefile the TRTL environment variable does not point to the project top-level directory, but it points to the software sub-tree. The software sub-tree should be under TRTL_SW Signed-off-by: Federico Vaga <federico.vaga@cern.ch>

sw: consinstent use of TRTL build env variable
In some Makefile the TRTL environment variable does not point to the project top-level directory, but it points to the software sub-tree. The software sub-tree should be under TRTL_SW Signed-off-by: Federico Vaga <federico.vaga@cern.ch>
4e976471 · Federico Vaga · ec65f08d · 4e976471 · 4e976471 · 4e976471
Commit 4e976471 authored Feb 06, 2019 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 8 deletions

Makefile software/include/hw/Makefile +1 -1

Makefile software/lib/Makefile +3 -2

Makefile software/tools/Makefile +6 -5

No files found.
--- a/software/include/hw/Makefile
+++ b/software/include/hw/Makefile
 HEADERS := mockturtle_cpu_csr.h
 HEADERS += mockturtle_cpu_lr.h

-TRTL = ../../..
+TRTL ?= ../../..
 TRTL_HDL = $(TRTL)/hdl/rtl/

 WBGEN2 ?= wbgen2

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


-TRTL ?= ../
+TRTL ?= ../../
+TRTL_SW = $(TRTL)/software

 LIBS = libmockturtle.so
 LIB = libmockturtle.a
@@ -16,7 +17,7 @@ LOBJ := libmockturtle.o
 LOBJ += libmockturtle-rt-msg.o

 CFLAGS += -Wall -Werror -ggdb -fPIC
-CFLAGS += -I. -I$(TRTL)/include $(EXTRACFLAGS)
+CFLAGS += -I. -I$(TRTL_SW)/include $(EXTRACFLAGS)
 LDFLAGS = -L. -lmockturtle
 ARFLAGS = rc


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

 DESTDIR ?= /usr/local
-TRTL ?= ../
+TRTL ?= ../../
+TRTL_SW = $(TRTL)/software

 GIT_VERSION := $(shell git describe --dirty --long --tags)

-CFLAGS += -Wall -Werror -ggdb -I$(TRTL)/lib
-CFLAGS += -I$(TRTL)/include
+CFLAGS += -Wall -Werror -ggdb -I$(TRTL_SW)/lib
+CFLAGS += -I$(TRTL_SW)/include
 CFLAGS += $(EXTRACFLAGS)
-LDLIBS += -Wl,-Bstatic -L$(TRTL)/lib -lmockturtle
+LDLIBS += -Wl,-Bstatic -L$(TRTL_SW)/lib -lmockturtle
 LDLIBS += -Wl,-Bdynamic -lpthread
 PROGS := mockturtle-count
 PROGS += lsmockturtle
@@ -33,7 +34,7 @@ install:
 	install -d $(DESTDIR)/bin
 	install -D $(PROGS) $(DESTDIR)/bin

-%: %.c $(TRTL)/libmockturtle.a
+%: %.c $(TRTL_SW)/lib/libmockturtle.a
 	$(CC) $(CFLAGS) $^ -o $@ $(LDLIBS)

 # make nothing for modules_install, but avoid errors