From 9c7046a25db5763cdaef98d30ab2789dc22b04dc Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Fri, 5 Feb 2016 21:44:21 +0100 Subject: [PATCH] Fix linking error with new autotools based libraries We may have reached peak Makefile mastery now ... Signed-off-by: Joachim Nilsson --- Makefile | 2 +- configure | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 03ddb924..d4d7d3fe 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ all: config.h $(EXEC) +$(MAKE) -C plugins $@ $(DEPLIBS): Makefile - +$(MAKE) -C `dirname $@` all + +$(MAKE) -C `dirname \`dirname $@\`` all $(OBJS): Makefile diff --git a/configure b/configure index 03f257a7..fc1112da 100755 --- a/configure +++ b/configure @@ -380,8 +380,7 @@ if [ x"$libite" != x"" ]; then echo "LDLIBS += -l:libite.so.2" >> config.mk else echo "LDFLAGS += -L\$(TOPDIR)/libite" >> config.mk - echo "LDLIBS += -lite" >> config.mk - echo "DEPLIBS += libite/libite.a" >> config.mk + echo "DEPLIBS += libite/.libs/libite.a" >> config.mk fi if [ x"$libuev" != x"" ]; then @@ -391,8 +390,7 @@ if [ x"$libuev" != x"" ]; then echo "LDLIBS += -l:libuev.so.1" >> config.mk else echo "LDFLAGS += -L\$(TOPDIR)/libuev" >> config.mk - echo "LDLIBS += -luev" >> config.mk - echo "DEPLIBS += libuev/libuev.a" >> config.mk + echo "DEPLIBS += libuev/.libs/libuev.a" >> config.mk fi echo >> config.mk