Skip to content

M
Mock Turtle
Commit 1d665b5f authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

sw:*: use implicit Makefile variable properly 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent 0212c7e3
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
software/lib/Makefile
View file @ 1d665b5f
...@@ -18,14 +18,13 @@ LOBJ += libmockturtle-rt-msg.o ...@@ -18,14 +18,13 @@ LOBJ += libmockturtle-rt-msg.o
CFLAGS += -Wall -Werror -ggdb -fPIC CFLAGS += -Wall -Werror -ggdb -fPIC
CFLAGS += -I. -I$(TRTL_SW)/include $(EXTRACFLAGS) CFLAGS += -I. -I$(TRTL_SW)/include $(EXTRACFLAGS)
LDFLAGS += -L. -lmockturtle
ARFLAGS = rcv ARFLAGS = rcv
modules all: $(LIB) $(LIBS) modules all: $(LIB) $(LIBS)
%: %.c $(LIB) %: %.c $(LIB)
$(CC) $(CFLAGS) $*.c $(LDFLAGS) -o $@ $(CC) $(CFLAGS) $*.c $(LDFLAGS) $(LDLIBS) -o $@
$(LIB): $(LOBJ) $(LIB): $(LOBJ)
$(AR) $(ARFLAGS) $@ $^ $(AR) $(ARFLAGS) $@ $^
......
software/tools/Makefile
View file @ 1d665b5f
...@@ -16,7 +16,8 @@ GIT_VERSION := $(shell git describe --dirty --long --tags) ...@@ -16,7 +16,8 @@ GIT_VERSION := $(shell git describe --dirty --long --tags)
CFLAGS += -Wall -Werror -ggdb -I$(TRTL_SW)/lib CFLAGS += -Wall -Werror -ggdb -I$(TRTL_SW)/lib
CFLAGS += -I$(TRTL_SW)/include CFLAGS += -I$(TRTL_SW)/include
CFLAGS += $(EXTRACFLAGS) CFLAGS += $(EXTRACFLAGS)
LDLIBS += -Wl,-Bstatic -L$(TRTL_SW)/lib -lmockturtle LDFLAGS += -L$(TRTL_SW)/lib
LDLIBS += -Wl,-Bstatic -lmockturtle
LDLIBS += -Wl,-Bdynamic -lpthread LDLIBS += -Wl,-Bdynamic -lpthread
PROGS := mockturtle-count PROGS := mockturtle-count
PROGS += lsmockturtle PROGS += lsmockturtle
...@@ -40,7 +41,7 @@ uninstall: ...@@ -40,7 +41,7 @@ uninstall:
rmdir --ignore-fail-on-non-empty $(DESTDIR)/bin rmdir --ignore-fail-on-non-empty $(DESTDIR)/bin
%: %.c $(TRTL_SW)/lib/libmockturtle.a %: %.c $(TRTL_SW)/lib/libmockturtle.a
$(CC) $(CFLAGS) $^ -o $@ $(LDLIBS) $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LDLIBS)
# make nothing for modules_install, but avoid errors # make nothing for modules_install, but avoid errors
modules_install: modules_install:
......
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