Commit 6bfa3cff authored by Dimitris Lampridis's avatar Dimitris Lampridis

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

parent 07f83040
......@@ -9,7 +9,7 @@ REPO_PARENT ?= ..
-include $(REPO_PARENT)/parent_common.mk
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),)
SO_VERSION_XYZ := 0
......@@ -20,7 +20,6 @@ DESTLIBDIR ?= $(PREFIX)/lib
WRTD_DEP_TRTL ?= ../../dependencies/mock-turtle/
MTLIB = $(WRTD_DEP_TRTL)/software/lib/libmockturtle.a
LIBSO = libwrtd.so
LIBSO_XYZ = $(LIBSO).$(SO_VERSION_XYZ)
LIB = libwrtd.a
......@@ -30,22 +29,17 @@ INCFLAGS=-I. -I../include -I$(WRTD_DEP_TRTL)/software/include \
-I$(WRTD_DEP_TRTL)/software/lib
CFLAGS += -fno-strict-aliasing $(INCFLAGS)
CFLAGS += -Wall -Werror
CFLAGS += -g
CFLAGS += -fPIC
CFLAGS += -Wall -Werror -fPIC
CFLAGS += -DVERSION="\"$(GIT_VERSION)\""
CFLAGS += $(EXTRACFLAGS)
ARFLAGS = rc
ARFLAGS = rcv
all: $(LIB) $(LIBSO)
$(LIB): $(OBJS)
$(AR) $(ARFLAGS) $@ $^
$(MTLIB):
cd $(@D) && $(MAKE) $(@F)
$(LIBSO_XYZ): $(LIB) $(MTLIB)
$(LIBSO_XYZ): $(LIB)
$(CC) -shared -o $@ -Wl,--whole-archive,-soname,$@ $^ \
-Wl,--no-whole-archive
......@@ -61,7 +55,7 @@ clean:
install: $(LIBSO) $(LIBSO_XYZ)
install -d $(DESTLIBDIR)
install -m 0755 $(LIBSO_XYZ) $(DESTLIBDIR)
test -e $(DESTLIBDIR)/$(LIBSO) || ln -s $(LIBSO_XYZ) $(DESTLIBDIR)/$(LIBSO)
ln -sf $(LIBSO_XYZ) $(DESTLIBDIR)/$(LIBSO)
uninstall:
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