diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2014-02-18 21:03:27 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2014-02-18 21:03:27 +0800 |
| commit | 29062e629f63935f5cd8bd018c27dd6a534a10dc (patch) | |
| tree | 002b79353c04ba0014120352b4c9219678161a46 /Makefile.in | |
| parent | 47f7272ba13df6cf9b67407d8296ad6a7bb977b2 (diff) | |
Fix building with system libtomcrypt/libtommath
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index 7675ea1..ea8d57e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -13,13 +13,15 @@ ifndef PROGRAMS 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 @@ link%: -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 |