Skip to content

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

[sw] do not pack MT lib inside WRTD lib, MT should be installed separately

parent 07f83040
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 11 deletions
software/lib/Makefile
View file @ 6bfa3cff
...@@ -9,7 +9,7 @@ REPO_PARENT ?= .. ...@@ -9,7 +9,7 @@ REPO_PARENT ?= ..
-include $(REPO_PARENT)/parent_common.mk -include $(REPO_PARENT)/parent_common.mk
GIT_VERSION := $(shell git describe --always --dirty --long --tags) GIT_VERSION := $(shell git describe --always --dirty --long --tags)
SO_VERSION_XYZ := $(shell git describe --always --abbrev=0 | grep -o -E "[0-9]+\.[0-9]+\.[0-9]") SO_VERSION_XYZ := $(shell git describe --tags --abbrev=0 | grep -o -E "[0-9]+\.[0-9]+\.[0-9]")
ifeq ($(SO_VERSION_XYZ),) ifeq ($(SO_VERSION_XYZ),)
SO_VERSION_XYZ := 0 SO_VERSION_XYZ := 0
...@@ -20,7 +20,6 @@ DESTLIBDIR ?= $(PREFIX)/lib ...@@ -20,7 +20,6 @@ DESTLIBDIR ?= $(PREFIX)/lib
WRTD_DEP_TRTL ?= ../../dependencies/mock-turtle/ WRTD_DEP_TRTL ?= ../../dependencies/mock-turtle/
MTLIB = $(WRTD_DEP_TRTL)/software/lib/libmockturtle.a
LIBSO = libwrtd.so LIBSO = libwrtd.so
LIBSO_XYZ = $(LIBSO).$(SO_VERSION_XYZ) LIBSO_XYZ = $(LIBSO).$(SO_VERSION_XYZ)
LIB = libwrtd.a LIB = libwrtd.a
...@@ -30,22 +29,17 @@ INCFLAGS=-I. -I../include -I$(WRTD_DEP_TRTL)/software/include \ ...@@ -30,22 +29,17 @@ INCFLAGS=-I. -I../include -I$(WRTD_DEP_TRTL)/software/include \
-I$(WRTD_DEP_TRTL)/software/lib -I$(WRTD_DEP_TRTL)/software/lib
CFLAGS += -fno-strict-aliasing $(INCFLAGS) CFLAGS += -fno-strict-aliasing $(INCFLAGS)
CFLAGS += -Wall -Werror CFLAGS += -Wall -Werror -fPIC
CFLAGS += -g
CFLAGS += -fPIC
CFLAGS += -DVERSION="\"$(GIT_VERSION)\"" CFLAGS += -DVERSION="\"$(GIT_VERSION)\""
CFLAGS += $(EXTRACFLAGS) CFLAGS += $(EXTRACFLAGS)
ARFLAGS = rc ARFLAGS = rcv
all: $(LIB) $(LIBSO) all: $(LIB) $(LIBSO)
$(LIB): $(OBJS) $(LIB): $(OBJS)
$(AR) $(ARFLAGS) $@ $^ $(AR) $(ARFLAGS) $@ $^
$(MTLIB): $(LIBSO_XYZ): $(LIB)
cd $(@D) && $(MAKE) $(@F)
$(LIBSO_XYZ): $(LIB) $(MTLIB)
$(CC) -shared -o $@ -Wl,--whole-archive,-soname,$@ $^ \ $(CC) -shared -o $@ -Wl,--whole-archive,-soname,$@ $^ \
-Wl,--no-whole-archive -Wl,--no-whole-archive
...@@ -61,7 +55,7 @@ clean: ...@@ -61,7 +55,7 @@ clean:
install: $(LIBSO) $(LIBSO_XYZ) install: $(LIBSO) $(LIBSO_XYZ)
install -d $(DESTLIBDIR) install -d $(DESTLIBDIR)
install -m 0755 $(LIBSO_XYZ) $(DESTLIBDIR) install -m 0755 $(LIBSO_XYZ) $(DESTLIBDIR)
test -e $(DESTLIBDIR)/$(LIBSO) || ln -s $(LIBSO_XYZ) $(DESTLIBDIR)/$(LIBSO) ln -sf $(LIBSO_XYZ) $(DESTLIBDIR)/$(LIBSO)
uninstall: uninstall:
rm -f $(DESTLIBDIR)/$(LIBSO) $(DESTLIBDIR)/$(LIBSO_XYZ) rm -f $(DESTLIBDIR)/$(LIBSO) $(DESTLIBDIR)/$(LIBSO_XYZ)
......
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