compile shared library - tools use static ones

Signed-off-by: Federico Vaga <federico.vaga@cern.ch> NOTE This commit has been created by `git subtree` on the Mock Turtle repository on tag mock-turtle-2.0 This commit will not compile

compile shared library - tools use static ones
Signed-off-by: Federico Vaga <federico.vaga@cern.ch> NOTE This commit has been created by `git subtree` on the Mock Turtle repository on tag mock-turtle-2.0 This commit will not compile
f7f90353 · Federico Vaga · a7b7c490 · f7f90353 · f7f90353
Commit f7f90353 authored Aug 26, 2015 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

Makefile lib/Makefile +6 -2

Makefile tools/Makefile +2 -1

No files found.
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -7,6 +7,7 @@ WRNC ?= ../../../
 LIBTDC ?= ../fmc-tdc-sw/lib
 LIBFD ?= ../fine-delay-sw/lib

+LIBS = libwrtd.so
 LIB = libwrtd.a
 LOBJ := libwrtd-internal.o
 LOBJ += libwrtd-common.o
@@ -14,12 +15,12 @@ LOBJ += libwrtd-logging.o
 LOBJ += libwrtd-input.o
 LOBJ += libwrtd-output.o

-CFLAGS += -Wall -ggdb -O2 -I. -I../include -I$(WRNC)/include -I$(WRNC)/lib -I$(LIBFD) -I$(LIBTDC) -I$(LIBFD)/../kernel
+CFLAGS += -Wall -ggdb -O2 -fPIC -I. -I../include -I$(WRNC)/include -I$(WRNC)/lib -I$(LIBFD) -I$(LIBTDC) -I$(LIBFD)/../kernel
 CFLAGS += $(EXTRACFLAGS)
 LDLIBS += -L. -lwrtd


-modules all: $(LIB)
+modules all: $(LIB) $(LIBS)


 %: %.c $(LIB)
@@ -28,6 +29,9 @@ modules all: $(LIB)
 $(LIB): $(LOBJ)
 	ar r $@ $^

+$(LIBS): $(LIB)
+	$(CC) -shared  -o $@ -Wl,--whole-archive,-soname,$@ $^ -Wl,--no-whole-archive
+
 clean:
 	rm -f $(LIB) .depend *.o *~


--- a/tools/Makefile
+++ b/tools/Makefile
@@ -10,7 +10,8 @@ WRNC ?= ../../../
 CFLAGS += -Wall -ggdb -I. -I../include -I$(WRNC)/include -I$(WRNC)/lib -I../lib
 CFLAGS += $(EXTRACFLAGS)
 CFLAGS += $(EXTRACFLAGS)
-LDLIBS += -L../lib -lwrtd -L$(WRNC)/lib -lwrnc -lpthread
+LDLIBS += -Wl,-Bstatic -L../lib -lwrtd -L$(WRNC)/lib -lwrnc
+LDLIBS += -Wl,-Bdynamic -lpthread

 PROGS := wrtd-boot
 PROGS += wrtd-in-config