Mercurial > dropbear
diff 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 |
line wrap: on
line diff
--- a/Makefile.in Mon Feb 17 22:05:59 2014 +0800 +++ b/Makefile.in Tue Feb 18 21:03:27 2014 +0800 @@ -13,13 +13,15 @@ PROGRAMS=dropbear dbclient dropbearkey dropbearconvert endif -LTC=libtomcrypt/libtomcrypt.a -LTM=libtommath/libtommath.a +STATIC_LTC=libtomcrypt/libtomcrypt.a +STATIC_LTM=libtommath/libtommath.a + +LIBTOM_LIBS=@LIBTOM_LIBS@ ifeq (@BUNDLED_LIBTOM@, 1) -LIBTOM_DEPS=$(LTC) $(LTM) +LIBTOM_DEPS=$(STATIC_LTC) $(STATIC_LTM) CFLAGS+=-I$(srcdir)/libtomcrypt/src/headers/ -LIBTOM_LIBS+=$(LTC) $(LTM) +LIBTOM_LIBS=$(STATIC_LTC) $(STATIC_LTM) endif COMMONOBJS=dbutil.o buffer.o \ @@ -192,10 +194,10 @@ -rm -f $*$(EXEEXT) -ln -s dropbearmulti$(EXEEXT) $*$(EXEEXT) -$(LTC): options.h +$(STATIC_LTC): options.h cd libtomcrypt && $(MAKE) -$(LTM): options.h +$(STATIC_LTM): options.h cd libtommath && $(MAKE) .PHONY : clean sizes thisclean distclean tidy ltc-clean ltm-clean