comparison Makefile.in @ 898:4f1988cb79ce

Fix building with system libtomcrypt/libtommath
author Matt Johnston <matt@ucc.asn.au>
date Tue, 18 Feb 2014 21:03:27 +0800
parents d50c17fe57d7
children 89555751c489 803c1f0b019b
comparison
equal deleted inserted replaced
897:5d3e917bb7a6 898:4f1988cb79ce
11 11
12 ifndef PROGRAMS 12 ifndef PROGRAMS
13 PROGRAMS=dropbear dbclient dropbearkey dropbearconvert 13 PROGRAMS=dropbear dbclient dropbearkey dropbearconvert
14 endif 14 endif
15 15
16 LTC=libtomcrypt/libtomcrypt.a 16 STATIC_LTC=libtomcrypt/libtomcrypt.a
17 LTM=libtommath/libtommath.a 17 STATIC_LTM=libtommath/libtommath.a
18
19 LIBTOM_LIBS=@LIBTOM_LIBS@
18 20
19 ifeq (@BUNDLED_LIBTOM@, 1) 21 ifeq (@BUNDLED_LIBTOM@, 1)
20 LIBTOM_DEPS=$(LTC) $(LTM) 22 LIBTOM_DEPS=$(STATIC_LTC) $(STATIC_LTM)
21 CFLAGS+=-I$(srcdir)/libtomcrypt/src/headers/ 23 CFLAGS+=-I$(srcdir)/libtomcrypt/src/headers/
22 LIBTOM_LIBS+=$(LTC) $(LTM) 24 LIBTOM_LIBS=$(STATIC_LTC) $(STATIC_LTM)
23 endif 25 endif
24 26
25 COMMONOBJS=dbutil.o buffer.o \ 27 COMMONOBJS=dbutil.o buffer.o \
26 dss.o bignum.o \ 28 dss.o bignum.o \
27 signkey.o rsa.o dbrandom.o \ 29 signkey.o rsa.o dbrandom.o \
190 192
191 link%: 193 link%:
192 -rm -f $*$(EXEEXT) 194 -rm -f $*$(EXEEXT)
193 -ln -s dropbearmulti$(EXEEXT) $*$(EXEEXT) 195 -ln -s dropbearmulti$(EXEEXT) $*$(EXEEXT)
194 196
195 $(LTC): options.h 197 $(STATIC_LTC): options.h
196 cd libtomcrypt && $(MAKE) 198 cd libtomcrypt && $(MAKE)
197 199
198 $(LTM): options.h 200 $(STATIC_LTM): options.h
199 cd libtommath && $(MAKE) 201 cd libtommath && $(MAKE)
200 202
201 .PHONY : clean sizes thisclean distclean tidy ltc-clean ltm-clean 203 .PHONY : clean sizes thisclean distclean tidy ltc-clean ltm-clean
202 204
203 ltc-clean: 205 ltc-clean: