Skip to content

W
White Rabbit Trigger Distribution
Commit 407f25d7 authored by Dimitris Lampridis's avatar Dimitris Lampridis
Browse files
Options

sw: rework Makefile variables for pointing to external dependencies

parent 532f38a7
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 31 deletions
software/Makefile
View file @ 407f25d7
......@@ -8,9 +8,9 @@ REPO_PARENT ?= $(CURDIR)/..
# This can be overriden in cases where WRTD itself is a dependency
# and one does not want to recursively check out WRTD's dependency
# on Mock Turtle.
DEP_MT ?= $(CURDIR)/../dependencies/mock-turtle
WRTD_DEP_TRTL ?= $(CURDIR)/../dependencies/mock-turtle
DIRS = $(DEP_MT)/software lib tools firmware unittest
DIRS = $(WRTD_DEP_TRTL)/software lib tools firmware
all clean: $(DIRS)
......
software/firmware/Makefile
View file @ 407f25d7
-include Makefile.specific
DIRS := tdc fd
DIRS := tdc fd adc
all clean cleanall modules install modules_install: $(DIRS)
......
software/firmware/adc/Makefile
View file @ 407f25d7
......@@ -3,19 +3,23 @@
OBJS := wrtd-rt-adc.o
OUTPUT = wrtd-rt-adc
TRTL ?= ../../../dependencies/mock-turtle/
TRTL_SW = $(TRTL)/software
WRTD_DEP_TRTL ?= ../../../dependencies/mock-turtle/
WRTD_DEP_FMC_ADC ?= ../../../dependencies/fmc-adc-100m14b4cha-gw
WRTD_DEP_GEN_CORES ?= ../../../dependencies/general-cores
EXTRA2_CFLAGS= # To be set by user on make line
EXTRA2_CFLAGS = # To be set by user on make line
EXTRA_CFLAGS += -I../../include -I../common \
-I../../../dependencies/fmc-adc-100m14b4cha-gw/hdl/rtl/wb_gen/ \
-I$(WRTD_DEP_FMC_ADC)/hdl/rtl/wb_gen/ \
-Werror $(EXTRA2_CFLAGS)
vpath %.c ../
MEM_INIT_GEN=../../../dependencies/general-cores/tools/mem_init_gen.py
MEM_INIT_GEN = $(WRTD_DEP_GEN_CORES)/tools/mem_init_gen.py
$(OUTPUT).bram: $(OUTPUT).bin
python $(MEM_INIT_GEN) -i $< > $@
include $(TRTL_SW)/firmware/Makefile
TRTL = $(WRTD_DEP_TRTL)
TRTL_SW = $(TRTL)/software
include $(WRTD_DEP_TRTL)/software/firmware/Makefile
software/firmware/fd/Makefile
View file @ 407f25d7
......@@ -4,17 +4,21 @@ OBJS := wrtd-rt-fd.o
OBJS += fd-acam.o fd-gpio.o fd-pll.o fd-i2c.o fd-calibrate.o fd-init.o
OBJDIR += common
OUTPUT = wrtd-rt-fd
TRTL ?= ../../../dependencies/mock-turtle/
TRTL_SW = $(TRTL)/software
EXTRA2_CFLAGS= # To be set by user on make line
WRTD_DEP_TRTL ?= ../../../dependencies/mock-turtle/
WRTD_DEP_GEN_CORES ?= ../../../dependencies/general-cores
EXTRA2_CFLAGS = # To be set by user on make line
EXTRA_CFLAGS += -I../../include -I../common -Werror -Wall $(EXTRA2_CFLAGS)
vpath %.c ../
MEM_INIT_GEN=../../../dependencies/general-cores/tools/mem_init_gen.py
MEM_INIT_GEN = $(WRTD_DEP_GEN_CORES)/tools/mem_init_gen.py
$(OUTPUT).bram: $(OUTPUT).bin
python $(MEM_INIT_GEN) -i $< > $@
include $(TRTL_SW)/firmware/Makefile
TRTL = $(WRTD_DEP_TRTL)
TRTL_SW = $(TRTL)/software
include $(WRTD_DEP_TRTL)/software/firmware/Makefile
software/firmware/tdc/Makefile
View file @ 407f25d7
......@@ -3,17 +3,20 @@
OBJS := wrtd-rt-tdc.o
OUTPUT = wrtd-rt-tdc
TRTL ?= ../../../dependencies/mock-turtle/
TRTL_SW = $(TRTL)/software
WRTD_DEP_TRTL ?= ../../../dependencies/mock-turtle/
WRTD_DEP_GEN_CORES ?= ../../../dependencies/general-cores
EXTRA2_CFLAGS= # To be set by user on make line
EXTRA2_CFLAGS = # To be set by user on make line
EXTRA_CFLAGS += -I../../include -I../common -Werror $(EXTRA2_CFLAGS)
vpath %.c ../
MEM_INIT_GEN=../../../dependencies/general-cores/tools/mem_init_gen.py
MEM_INIT_GEN = $(WRTD_DEP_GEN_CORES)/tools/mem_init_gen.py
$(OUTPUT).bram: $(OUTPUT).bin
python $(MEM_INIT_GEN) -i $< > $@
include $(TRTL_SW)/firmware/Makefile
TRTL = $(WRTD_DEP_TRTL)
TRTL_SW = $(TRTL)/software
include $(WRTD_DEP_TRTL)/software/firmware/Makefile
software/lib/Makefile
View file @ 407f25d7
......@@ -8,13 +8,14 @@
REPO_PARENT ?= ..
-include $(REPO_PARENT)/parent_common.mk
TRTL ?= ../../dependencies/mock-turtle/software
WRTD_DEP_TRTL ?= ../../dependencies/mock-turtle/
WRTD_DEP_FMC_ADC ?= ../../dependencies/fmc-adc-100m14b4cha-gw
LIB = libwrtd.a
OBJS := libwrtd-base.o libwrtd-devices.o libwrtd-attributes.o libwrtd-rules.o
INCFLAGS=-I. -I../include -I$(TRTL)/include -I$(TRTL)/lib \
-I../firmware/tdc -I../../dependencies/fmc-adc-100m14b4cha-gw/hdl/rtl/wb_gen/
INCFLAGS=-I. -I../include -I$(WRTD_DEP_TRTL)/software/include \
-I$(WRTD_DEP_TRTL)/software/lib -I../firmware/tdc -I$(WRTD_DEP_FMC_ADC)/hdl/rtl/wb_gen/
CFLAGS += -fno-strict-aliasing $(INCFLAGS)
CFLAGS += -Wall -Werror
......
software/stresstests/Makefile
View file @ 407f25d7
......@@ -8,12 +8,13 @@
REPO_PARENT ?= ..
-include $(REPO_PARENT)/parent_common.mk
TRTL ?= ../../dependencies/mock-turtle/software
WRTD_DEP_TRTL ?= ../../../dependencies/mock-turtle/
CFLAGS += -Wall -g -O0
CFLAGS += -I. -I../include -I$(TRTL)/include -I$(TRTL)/lib -I../lib
CFLAGS += -I. -I../include -I$(WRTD_DEP_TRTL)/software/include \
-I$(WRTD_DEP_TRTL)/software/lib -I../lib
CFLAGS += $(EXTRACFLAGS)
LDLIBS += ../lib/libwrtd.a $(TRTL)/lib/libmockturtle.a
LDLIBS += ../lib/libwrtd.a $(WRTD_DEP_TRTL)/software/lib/libmockturtle.a
PROGS= wrtd-timetest wrtd-freqmeter
......
software/tools/.gitignore
View file @ 407f25d7
......@@ -2,3 +2,4 @@ wrtd-boot
wrtd-in-config
wrtd-out-config
wrtd-logging
wrtd-config
software/tools/Makefile
View file @ 407f25d7
......@@ -10,13 +10,13 @@ REPO_PARENT ?= ..
DESTDIR ?= /usr/local
TRTL ?= ../../dependencies/mock-turtle/software
WRTD_DEP_TRTL ?= ../../dependencies/mock-turtle/
CFLAGS += -Wall -Werror -ggdb
CFLAGS += -I. -I../include -I$(TRTL)/include -I$(TRTL)/lib -I../lib
CFLAGS += -I. -I../include -I$(WRTD_DEP_TRTL)/software/include -I$(WRTD_DEP_TRTL)/software/lib -I../lib
CFLAGS += $(EXTRACFLAGS)
CFLAGS += $(EXTRACFLAGS)
LDLIBS += ../lib/libwrtd.a $(TRTL)/lib/libmockturtle.a
LDLIBS += ../lib/libwrtd.a $(WRTD_DEP_TRTL)/software/lib/libmockturtle.a
PROGS := wrtd-boot wrtd-config wrtd-logging
#PROGS += wrtd-in-config
......
software/unittest/Makefile
View file @ 407f25d7
......@@ -8,13 +8,13 @@
REPO_PARENT ?= ..
-include $(REPO_PARENT)/parent_common.mk
TRTL ?= ../../dependencies/mock-turtle/software
WRTD_DEP_TRTL ?= ../../dependencies/mock-turtle
CFLAGS += -Wall -ggdb -O0
CFLAGS += -I. -I../include -I$(TRTL)/include -I$(TRTL)/lib -I../lib
CFLAGS += -I. -I../include -I$(WRTD_DEP_TRTL)/software/include -I$(WRTD_DEP_TRTL)/software/lib -I../lib
CFLAGS += $(EXTRACFLAGS)
CFLAGS += $(EXTRACFLAGS)
LDLIBS += -Wl,-Bstatic -L../lib -lwrtd -L$(TRTL)/lib -lmockturtle
LDLIBS += -Wl,-Bstatic -L../lib -lwrtd -L$(WRTD_DEP_TRTL)/software/lib -lmockturtle
LDLIBS += -Wl,-Bdynamic
PROG := wrtd-ut
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment