Skip to content

F
FMC ADC 100M 14b 4cha - Software
Commit b9458576 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

tools: compile using new library 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent 51feff08
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 4 deletions
Makefile
View file @ b9458576
......@@ -2,7 +2,7 @@
.PHONY: all clean modules install modules_install clean_all
.PHONY: gitmodules prereq prereq_install prereq_install_warn prereq_clean
DIRS = kernel tools lib libtools
DIRS = kernel tools adc-lib libtools
all clean modules install modules_install: gitmodules
@if echo $@ | grep -q install; then $(MAKE) prereq_install_warn; fi
......@@ -25,11 +25,17 @@ gitmodules:
#
# Use the absolute path so it can be used by submodule
CURDIR ?= $(shell pwd)
FMCADC100M ?= $(CURDIR)
export FMCADC100M
FMC_BUS ?= $(CURDIR)/fmc-bus
export FMC_BUS
ZIO ?= $(CURDIR)/zio
export ZIO
ZIO_VERSION = $(shell cd $(ZIO); git describe --always --dirty --long --tags)
export ZIO_VERSION
SPEC_SW ?= $(CURDIR)/spec-sw
SUBMOD = $(FMC_BUS) $(ZIO) $(SPEC_SW)
......
libtools/Makefile
View file @ b9458576
......@@ -5,11 +5,11 @@
DESTDIR ?= /usr/local
LIBADC = ../lib/
LIBADC = ../adc-lib/lib/
ZIO ?= ../zio
CFLAGS = -Wall -g -ggdb -I$(LIBADC) -I$(ZIO)/include -I../kernel $(EXTRACFLAGS)
LDFLAGS = -L$(LIBADC) -lfmcadc -lpthread -lrt
LDFLAGS = -static -L$(LIBADC) -ladc -Wl,-dy -lpthread -lrt
DEMOS := fald-simple-acq fald-acq fald-trg-cfg
DEMOS += fald-simple-get-conf
......@@ -25,7 +25,7 @@ install:
install -d $(DESTDIR)/bin
install -D $(DEMOS) $(DESTDIR)/bin
%: %.c $(LIBADC)/libfmcadc.a
%: %.c $(LIBADC)/libadc.a
$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS)
# make nothing for modules_install, but avoid errors
......
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