# HG changeset patch # User Nicolas Boos # Date 1391730812 -28800 # Node ID 3899ca4b65fd60811b735cf8e8559bf9ab0d6704 # Parent 6e6ae84d3dbaf56c327fffa2647e120ebfb53f56 Avoid linking dropbearconvert and dropbearkey to libz or libutil diff -r 6e6ae84d3dba -r 3899ca4b65fd Makefile.in --- a/Makefile.in Tue Jan 28 22:44:24 2014 +0800 +++ b/Makefile.in Fri Feb 07 07:53:32 2014 +0800 @@ -19,7 +19,7 @@ ifeq (@BUNDLED_LIBTOM@, 1) LIBTOM_DEPS=$(LTC) $(LTM) CFLAGS+=-I$(srcdir)/libtomcrypt/src/headers/ -LIBS+=$(LTC) $(LTM) +LIBTOM_LIBS+=$(LTC) $(LTM) endif COMMONOBJS=dbutil.o buffer.o \ @@ -160,8 +160,11 @@ dropbearkey: $(dropbearkeyobjs) dropbearconvert: $(dropbearconvertobjs) -dropbear dbclient dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile - $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBS) +dropbear dbclient: $(HEADERS) $(LIBTOM_DEPS) Makefile + $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBTOM_LIBS) $(LIBS) + +dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile + $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBTOM_LIBS) # scp doesn't use the libs so is special. scp: $(SCPOBJS) $(HEADERS) Makefile @@ -176,7 +179,7 @@ endif dropbearmulti$(EXEEXT): $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile - $(CC) $(LDFLAGS) -o $@ $(MULTIOBJS) $(LIBS)$ + $(CC) $(LDFLAGS) -o $@ $(MULTIOBJS) $(LIBTOM_LIBS) $(LIBS)$ multibinary: dropbearmulti$(EXEEXT)