comparison Makefile.in @ 839:33207ed1174b

Merge in ECC
author Matt Johnston <matt@ucc.asn.au>
date Mon, 21 Oct 2013 22:57:21 +0800
parents 4095b6d7c9fc
children b298bb438625 6c69e7df3621
comparison
equal deleted inserted replaced
834:e378da7eae5d 839:33207ed1174b
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) 19 ifeq (@BUNDLED_LIBTOM@, 1)
20 LIBTOM_DEPS=$(LTC) $(LTM) 20 LIBTOM_DEPS=$(LTC) $(LTM)
21 CFLAGS+=-I$(srcdir)/libtomcrypt/src/headers/ 21 CFLAGS+=-I$(srcdir)/libtomcrypt/src/headers/
22 LIBS+=$(LTC) $(LTM) 22 LIBS+=$(LTC) $(LTM)
23 endif 23 endif
24 24
25 COMMONOBJS=dbutil.o buffer.o \ 25 COMMONOBJS=dbutil.o buffer.o \
26 dss.o bignum.o \ 26 dss.o bignum.o \
27 signkey.o rsa.o random.o \ 27 signkey.o rsa.o random.o \
28 queue.o \ 28 queue.o \
29 atomicio.o compat.o fake-rfc2553.o 29 atomicio.o compat.o fake-rfc2553.o \
30 ltc_prng.o ecc.o ecdsa.o crypto_desc.o
30 31
31 SVROBJS=svr-kex.o svr-auth.o sshpty.o \ 32 SVROBJS=svr-kex.o svr-auth.o sshpty.o \
32 svr-authpasswd.o svr-authpubkey.o svr-authpubkeyoptions.o svr-session.o svr-service.o \ 33 svr-authpasswd.o svr-authpubkey.o svr-authpubkeyoptions.o svr-session.o svr-service.o \
33 svr-chansession.o svr-runopts.o svr-agentfwd.o svr-main.o svr-x11fwd.o\ 34 svr-chansession.o svr-runopts.o svr-agentfwd.o svr-main.o svr-x11fwd.o\
34 svr-tcpfwd.o svr-authpam.o 35 svr-tcpfwd.o svr-authpam.o
52 HEADERS=options.h dbutil.h session.h packet.h algo.h ssh.h buffer.h kex.h \ 53 HEADERS=options.h dbutil.h session.h packet.h algo.h ssh.h buffer.h kex.h \
53 dss.h bignum.h signkey.h rsa.h random.h service.h auth.h \ 54 dss.h bignum.h signkey.h rsa.h random.h service.h auth.h \
54 debug.h channel.h chansession.h config.h queue.h sshpty.h \ 55 debug.h channel.h chansession.h config.h queue.h sshpty.h \
55 termcodes.h gendss.h genrsa.h runopts.h includes.h \ 56 termcodes.h gendss.h genrsa.h runopts.h includes.h \
56 loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \ 57 loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \
57 listener.h fake-rfc2553.h 58 listener.h fake-rfc2553.h ecc.h ecdsa.h
58 59
59 dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@ 60 dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@
60 dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS) 61 dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS)
61 dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS) 62 dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS)
62 dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS) 63 dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS)
183 link%: 184 link%:
184 -rm -f $*$(EXEEXT) 185 -rm -f $*$(EXEEXT)
185 -ln -s dropbearmulti$(EXEEXT) $*$(EXEEXT) 186 -ln -s dropbearmulti$(EXEEXT) $*$(EXEEXT)
186 187
187 $(LTC): options.h 188 $(LTC): options.h
188 cd libtomcrypt && $(MAKE) clean && $(MAKE) 189 cd libtomcrypt && $(MAKE)
189 190
190 $(LTM): options.h 191 $(LTM): options.h
191 cd libtommath && $(MAKE) 192 cd libtommath && $(MAKE)
192 193
193 .PHONY : clean sizes thisclean distclean tidy ltc-clean ltm-clean 194 .PHONY : clean sizes thisclean distclean tidy ltc-clean ltm-clean