Mercurial > dropbear
diff 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 |
line wrap: on
line diff
--- 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)