61e83f9c29
- drop mirror www.mirrors.wiretapped.net (not working anymore) - drop patch 300-ipv6_addr_port_split.patch, included upstream - refresh patches - various upstream changes: http://matt.ucc.asn.au/dropbear/CHANGES Signed-off-by: Catalin Patulea <cat@vv.carleton.ca> SVN-Revision: 38356
29 lines
1,001 B
Diff
29 lines
1,001 B
Diff
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -56,7 +56,7 @@ HEADERS=options.h dbutil.h session.h pac
|
|
loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \
|
|
listener.h fake-rfc2553.h
|
|
|
|
-dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@
|
|
+dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS)
|
|
dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS)
|
|
dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS)
|
|
dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS)
|
|
@@ -78,7 +78,7 @@ STRIP=@STRIP@
|
|
INSTALL=@INSTALL@
|
|
CPPFLAGS=@CPPFLAGS@
|
|
CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@
|
|
-LIBS+=@LIBS@
|
|
+LIBS+=@CRYPTLIB@ @LIBS@
|
|
LDFLAGS=@LDFLAGS@
|
|
|
|
EXEEXT=@EXEEXT@
|
|
@@ -168,7 +168,7 @@ scp: $(SCPOBJS) $(HEADERS) Makefile
|
|
# multi-binary compilation.
|
|
MULTIOBJS=
|
|
ifeq ($(MULTI),1)
|
|
- MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) @CRYPTLIB@
|
|
+ MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs)))
|
|
CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI
|
|
endif
|
|
|