Revert "Adjust linking so that wrapper libraries are static."

This reverts commit 021eb836e4984b718480bfc6c9ce20ae4a1194bf.

That commit introduces regression, see
https://github.com/yrutschle/sslh/issues/157#issuecomment-352260802
for discussion.
This commit is contained in:
Yves Rutschle 2017-12-17 16:59:57 +01:00
parent b36fc73b7a
commit 0fc6bc8d12

View File

@ -24,7 +24,7 @@ endif
CC ?= gcc
CFLAGS ?=-Wall -g $(CFLAGS_COV)
LIBS=-Wl,--as-needed
LIBS=
OBJS=common.o sslh-main.o probe.o tls.o
CONDITIONAL_TARGETS=
@ -40,7 +40,7 @@ endif
ifneq ($(strip $(USELIBPCRE)),)
CPPFLAGS+=-DLIBPCRE
LIBS:=$(LIBS) -Wl,-Bstatic -lpcreposix -Wl,-Bdynamic -lpcre
LIBS:=$(LIBS) -lpcreposix
endif
ifneq ($(strip $(USELIBCONFIG)),)
@ -54,7 +54,7 @@ ifneq ($(strip $(USELIBCAP)),)
endif
ifneq ($(strip $(USESYSTEMD)),)
LIBS:=$(LIBS) -Wl,-Bstatic -lsystemd -Wl,-Bdynamic
LIBS:=$(LIBS) -lsystemd
CPPFLAGS+=-DSYSTEMD
CONDITIONAL_TARGETS+=systemd-sslh-generator
endif