From e93b029a3ad309fc394cd6747187f4be4404a398 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Sat, 22 Aug 2015 13:05:57 +0100 Subject: [PATCH] Link modules against libznc.dll.a on cygwin instead of cygznc-1.7.dll, as it's being built now anyway. --- Makefile.in | 3 +-- modules/Makefile.in | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4a2321ba..44426702 100644 --- a/Makefile.in +++ b/Makefile.in @@ -21,7 +21,6 @@ LDFLAGS := @LDFLAGS@ LIBS := @LIBS@ LIBZNC := @LIBZNC@ LIBZNCDIR:= @LIBZNCDIR@ -LIBZNC_VERSION := @LIBZNC_VERSION@ MODDIR := @MODDIR@ DATADIR := @DATADIR@ PKGCONFIGDIR := $(libdir)/pkgconfig @@ -89,7 +88,7 @@ znc: $(OBJS) else znc: $(BIN_OBJS) $(LIBZNC) $(E) Linking znc... - $(Q)$(CXX) $(LDFLAGS) -o $@ $(BIN_OBJS) -L. -lznc-$(LIBZNC_VERSION) -Wl,-rpath,$(LIBZNCDIR) $(LIBS) + $(Q)$(CXX) $(LDFLAGS) -o $@ $(BIN_OBJS) -L. -lznc -Wl,-rpath,$(LIBZNCDIR) $(LIBS) $(LIBZNC): $(LIB_OBJS) $(E) Linking $(LIBZNC)... diff --git a/modules/Makefile.in b/modules/Makefile.in index c069cdd0..bc6c64de 100644 --- a/modules/Makefile.in +++ b/modules/Makefile.in @@ -40,7 +40,6 @@ MODDIR := @MODDIR@ DATADIR := @DATADIR@ LIBZNC := @LIBZNC@ LIBZNCDIR:= @LIBZNCDIR@ -LIBZNC_VERSION := @LIBZNC_VERSION@ INSTALL := @INSTALL@ INSTALL_PROGRAM := @INSTALL_PROGRAM@ INSTALL_SCRIPT := @INSTALL_SCRIPT@ @@ -63,7 +62,7 @@ C= endif ifneq "$(LIBZNC)" "" -LIBS += -L.. -lznc-$(LIBZNC_VERSION) -Wl,-rpath,$(LIBZNCDIR) +LIBS += -L.. -lznc -Wl,-rpath,$(LIBZNCDIR) endif CLEAN :=