From: Michael Olbrich Date: Thu, 30 Jun 2016 12:20:16 +0200 Subject: [PATCH] fix linking libreg Signed-off-by: Michael Olbrich Signed-off-by: Marc Kleine-Budde --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a3ead30371c9..2f485724c3be 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ CFLAGS += -std=gnu99 -Wall -Werror -pedantic CFLAGS += -Wall -g LDLIBREG += -lreg LDLIBS += $(LDLIBREG) -LDLIBS += -lm +LIBREGLIBS += -lm LIBREG += libreg.so LDFLAGS += -L ./ @@ -40,13 +40,13 @@ all_noverify: $(LIBREG) crda intersect regdbdump db2rd optimize ifeq ($(USE_OPENSSL),1) CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl` -LDLIBS += `pkg-config --libs openssl` +LIBREGLIBS += `pkg-config --libs openssl` $(LIBREG): keys-ssl.c else CFLAGS += -DUSE_GCRYPT -LDLIBS += -lgcrypt +LIBREGLIBS += -lgcrypt $(LIBREG): keys-gcrypt.c @@ -116,7 +116,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) $(LIBREG): regdb.h reglib.h reglib.c $(NQ) ' CC ' $@ - $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ + $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LIBREGLIBS) install-libreg-headers: $(NQ) ' INSTALL libreg-headers'