Commit 5ea428a3 authored by Nicolas Boos's avatar Nicolas Boos
Browse files

Avoid linking dropbearconvert and dropbearkey to libz or libutil

parent af524c4d
...@@ -19,7 +19,7 @@ LTM=libtommath/libtommath.a ...@@ -19,7 +19,7 @@ LTM=libtommath/libtommath.a
ifeq (@[email protected], 1) ifeq (@[email protected], 1)
LIBTOM_DEPS=$(LTC) $(LTM) LIBTOM_DEPS=$(LTC) $(LTM)
CFLAGS+=-I$(srcdir)/libtomcrypt/src/headers/ CFLAGS+=-I$(srcdir)/libtomcrypt/src/headers/
LIBS+=$(LTC) $(LTM) LIBTOM_LIBS+=$(LTC) $(LTM)
endif endif
COMMONOBJS=dbutil.o buffer.o \ COMMONOBJS=dbutil.o buffer.o \
...@@ -160,8 +160,11 @@ dbclient: $(dbclientobjs) ...@@ -160,8 +160,11 @@ dbclient: $(dbclientobjs)
dropbearkey: $(dropbearkeyobjs) dropbearkey: $(dropbearkeyobjs)
dropbearconvert: $(dropbearconvertobjs) dropbearconvert: $(dropbearconvertobjs)
dropbear dbclient dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile dropbear dbclient: $(HEADERS) $(LIBTOM_DEPS) Makefile
$(CC) $(LDFLAGS) -o [email protected]$(EXEEXT) $([email protected]objs) $(LIBS) $(CC) $(LDFLAGS) -o [email protected]$(EXEEXT) $([email protected]objs) $(LIBTOM_LIBS) $(LIBS)
dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile
$(CC) $(LDFLAGS) -o [email protected]$(EXEEXT) $([email protected]objs) $(LIBTOM_LIBS)
# scp doesn't use the libs so is special. # scp doesn't use the libs so is special.
scp: $(SCPOBJS) $(HEADERS) Makefile scp: $(SCPOBJS) $(HEADERS) Makefile
...@@ -176,7 +179,7 @@ ifeq ($(MULTI),1) ...@@ -176,7 +179,7 @@ ifeq ($(MULTI),1)
endif endif
dropbearmulti$(EXEEXT): $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile dropbearmulti$(EXEEXT): $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile
$(CC) $(LDFLAGS) -o [email protected] $(MULTIOBJS) $(LIBS)$ $(CC) $(LDFLAGS) -o [email protected] $(MULTIOBJS) $(LIBTOM_LIBS) $(LIBS)$
multibinary: dropbearmulti$(EXEEXT) multibinary: dropbearmulti$(EXEEXT)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment