comparison Makefile.in @ 585:d194db6f9453

Use system libtomcrypt/libtommath if available. Doesn't currently build due to clash in rsa_key identifier.
author Matt Johnston <matt@ucc.asn.au>
date Wed, 21 Jul 2010 12:38:46 +0000
parents fb9a341e4454
children 1151059c5eff
comparison
equal deleted inserted replaced
584:0442c18da5c9 585:d194db6f9453
14 endif 14 endif
15 15
16 LTC=libtomcrypt/libtomcrypt.a 16 LTC=libtomcrypt/libtomcrypt.a
17 LTM=libtommath/libtommath.a 17 LTM=libtommath/libtommath.a
18 18
19 ifeq (@BUNDLED_LIBTOM@, 1)
20 LIBTOM_DEPS=$(LTC) $(LTM)
21 CFLAGS+=-I$(srcdir)/libtomcrypt/src/headers/
22 LIBS+=$(LTC) $(LTM)
23 endif
24
19 COMMONOBJS=dbutil.o buffer.o \ 25 COMMONOBJS=dbutil.o buffer.o \
20 dss.o bignum.o \ 26 dss.o bignum.o \
21 signkey.o rsa.o random.o \ 27 signkey.o rsa.o random.o \
22 queue.o \ 28 queue.o \
23 atomicio.o compat.o fake-rfc2553.o 29 atomicio.o compat.o fake-rfc2553.o
68 AR=@AR@ 74 AR=@AR@
69 RANLIB=@RANLIB@ 75 RANLIB=@RANLIB@
70 STRIP=@STRIP@ 76 STRIP=@STRIP@
71 INSTALL=@INSTALL@ 77 INSTALL=@INSTALL@
72 CPPFLAGS=@CPPFLAGS@ 78 CPPFLAGS=@CPPFLAGS@
73 CFLAGS=-I. -I$(srcdir) -I$(srcdir)/libtomcrypt/src/headers/ $(CPPFLAGS) @CFLAGS@ 79 CFLAGS=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@
74 LIBS=$(LTC) $(LTM) @LIBS@ 80 LIBS+=@LIBS@
75 LDFLAGS=@LDFLAGS@ 81 LDFLAGS=@LDFLAGS@
76 82
77 EXEEXT=@EXEEXT@ 83 EXEEXT=@EXEEXT@
78 84
79 # whether we're building client, server, or both for the common objects. 85 # whether we're building client, server, or both for the common objects.
104 110
105 # for the scp progress meter. The -D doesn't affect anything else. 111 # for the scp progress meter. The -D doesn't affect anything else.
106 ifeq ($(SCPPROGRESS), 1) 112 ifeq ($(SCPPROGRESS), 1)
107 CFLAGS+=-DPROGRESS_METER 113 CFLAGS+=-DPROGRESS_METER
108 endif 114 endif
109
110 #%: $(HEADERS)
111 #%: $(HEADERS) Makefile
112 # TODO
113 115
114 all: $(TARGETS) 116 all: $(TARGETS)
115 117
116 strip: $(TARGETS) 118 strip: $(TARGETS)
117 $(STRIP) $(addsuffix $(EXEEXT), $(TARGETS)) 119 $(STRIP) $(addsuffix $(EXEEXT), $(TARGETS))
152 dropbear: $(dropbearobjs) 154 dropbear: $(dropbearobjs)
153 dbclient: $(dbclientobjs) 155 dbclient: $(dbclientobjs)
154 dropbearkey: $(dropbearkeyobjs) 156 dropbearkey: $(dropbearkeyobjs)
155 dropbearconvert: $(dropbearconvertobjs) 157 dropbearconvert: $(dropbearconvertobjs)
156 158
157 dropbear dbclient dropbearkey dropbearconvert: $(HEADERS) $(LTC) $(LTM) \ 159 dropbear dbclient dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile
158 Makefile
159 $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBS) 160 $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBS)
160 161
161 # scp doesn't use the libs so is special. 162 # scp doesn't use the libs so is special.
162 scp: $(SCPOBJS) $(HEADERS) Makefile 163 scp: $(SCPOBJS) $(HEADERS) Makefile
163 $(CC) $(LDFLAGS) -o $@$(EXEEXT) $(SCPOBJS) 164 $(CC) $(LDFLAGS) -o $@$(EXEEXT) $(SCPOBJS)
170 CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI 171 CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI
171 endif 172 endif
172 173
173 dropbearmulti: multilink 174 dropbearmulti: multilink
174 175
175 multibinary: $(HEADERS) $(MULTIOBJS) $(LTC) $(LTM) Makefile 176 multibinary: $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile
176 $(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS) 177 $(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS)
177 178
178 multilink: multibinary $(addprefix link, $(PROGRAMS)) 179 multilink: multibinary $(addprefix link, $(PROGRAMS))
179 180
180 link%: 181 link%: