adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-07 09:22:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Link modules against libznc.dll.a on cygwin instead of cygznc-1.7.dll, as it's being built now anyway.

Browse Source
This commit is contained in:
Alexey Sokolov
2015-08-22 13:05:57 +01:00
parent 4aba9fed17
commit e93b029a3a
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.in
+1 -2
View File
@@ -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)...
modules/Makefile.in
+1 -2
View File
@@ -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 :=