comparison Makefile.in @ 889:3899ca4b65fd

Avoid linking dropbearconvert and dropbearkey to libz or libutil
author Nicolas Boos <nicolas.boos@wanadoo.fr>
date Fri, 07 Feb 2014 07:53:32 +0800
parents f05107560aa9
children d50c17fe57d7
comparison
equal deleted inserted replaced
888:6e6ae84d3dba 889:3899ca4b65fd
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 LIBTOM_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 dbrandom.o \ 27 signkey.o rsa.o dbrandom.o \
158 dropbear: $(dropbearobjs) 158 dropbear: $(dropbearobjs)
159 dbclient: $(dbclientobjs) 159 dbclient: $(dbclientobjs)
160 dropbearkey: $(dropbearkeyobjs) 160 dropbearkey: $(dropbearkeyobjs)
161 dropbearconvert: $(dropbearconvertobjs) 161 dropbearconvert: $(dropbearconvertobjs)
162 162
163 dropbear dbclient dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile 163 dropbear dbclient: $(HEADERS) $(LIBTOM_DEPS) Makefile
164 $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBS) 164 $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBTOM_LIBS) $(LIBS)
165
166 dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile
167 $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBTOM_LIBS)
165 168
166 # scp doesn't use the libs so is special. 169 # scp doesn't use the libs so is special.
167 scp: $(SCPOBJS) $(HEADERS) Makefile 170 scp: $(SCPOBJS) $(HEADERS) Makefile
168 $(CC) $(LDFLAGS) -o $@$(EXEEXT) $(SCPOBJS) 171 $(CC) $(LDFLAGS) -o $@$(EXEEXT) $(SCPOBJS)
169 172
174 MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) @CRYPTLIB@ 177 MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) @CRYPTLIB@
175 CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI 178 CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI
176 endif 179 endif
177 180
178 dropbearmulti$(EXEEXT): $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile 181 dropbearmulti$(EXEEXT): $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile
179 $(CC) $(LDFLAGS) -o $@ $(MULTIOBJS) $(LIBS)$ 182 $(CC) $(LDFLAGS) -o $@ $(MULTIOBJS) $(LIBTOM_LIBS) $(LIBS)$
180 183
181 multibinary: dropbearmulti$(EXEEXT) 184 multibinary: dropbearmulti$(EXEEXT)
182 185
183 multilink: multibinary $(addprefix link, $(PROGRAMS)) 186 multilink: multibinary $(addprefix link, $(PROGRAMS))
184 187