summaryrefslogtreecommitdiffhomepage
path: root/Makefile.in
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2018-01-23 22:46:07 +0800
committerMatt Johnston <matt@ucc.asn.au>2018-01-23 22:46:07 +0800
commit597f7eb5e921c70545d3f45e2b5e0b19867573e0 (patch)
tree5172646de5e5d4c9de17f85cbe24c7db3f165756 /Makefile.in
parent5cd003d9e6d36fcca0ef40f12b8c8e4e540c58c7 (diff)
parentba23b823dcec4203dcee59204f0a7dac1a390d96 (diff)
merge up to date
--HG-- branch : fuzz
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in20
1 files changed, 11 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in
index 0ed124d..1d0a858 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,12 +2,11 @@
# @configure_input@
# invocation:
-# make PROGRAMS="dropbear dbclient scp" MULTI=1 STATIC=1 SCPPROGRESS=1
+# make PROGRAMS="dropbear dbclient scp" MULTI=1 SCPPROGRESS=1
#
-# to make a multiple-program statically linked binary "staticdropbearmulti".
+# to make a multiple-program binary "dropbearmulti".
# This example will include dropbear, scp, dropbearkey, dropbearconvert, and
# dbclient functionality, and includes the progress-bar functionality in scp.
-# Hopefully that seems intuitive.
ifndef PROGRAMS
PROGRAMS=dropbear dbclient dropbearkey dropbearconvert
@@ -35,7 +34,7 @@ COMMONOBJS=dbutil.o buffer.o dbhelpers.o \
atomicio.o compat.o fake-rfc2553.o \
ltc_prng.o ecc.o ecdsa.o crypto_desc.o \
dbmalloc.o \
- gensignkey.o gendss.o genrsa.o
+ gensignkey.o gendss.o genrsa.o
SVROBJS=svr-kex.o svr-auth.o sshpty.o \
svr-authpasswd.o svr-authpubkey.o svr-authpubkeyoptions.o svr-session.o svr-service.o \
@@ -99,6 +98,8 @@ LDFLAGS=@LDFLAGS@
EXEEXT=@EXEEXT@
+STATIC=@STATIC@
+
# whether we're building client, server, or both for the common objects.
# evilness so we detect 'dropbear' by itself as a word
space:= $(empty) $(empty)
@@ -120,7 +121,7 @@ ifeq ($(STATIC), 1)
endif
ifeq ($(MULTI), 1)
- TARGETS=dropbearmulti
+ TARGETS=dropbearmulti$(EXEEXT)
else
TARGETS=$(PROGRAMS)
endif
@@ -137,14 +138,14 @@ strip: $(TARGETS)
install: $(addprefix inst_, $(TARGETS))
-insmultidropbear: dropbearmulti
+insmultidropbear: dropbearmulti$(EXEEXT)
$(INSTALL) -d $(DESTDIR)$(sbindir)
-rm -f $(DESTDIR)$(sbindir)/dropbear$(EXEEXT)
-ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(sbindir)/dropbear$(EXEEXT)
$(INSTALL) -d $(DESTDIR)$(mandir)/man8
$(INSTALL) -m 644 $(srcdir)/dropbear.8 $(DESTDIR)$(mandir)/man8/dropbear.8
-insmulti%: dropbearmulti
+insmulti%: dropbearmulti$(EXEEXT)
$(INSTALL) -d $(DESTDIR)$(bindir)
-rm -f $(DESTDIR)$(bindir)/$*$(EXEEXT)
-ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(bindir)/$*$(EXEEXT)
@@ -224,8 +225,9 @@ sizes: dropbear
clean: ltc-clean ltm-clean thisclean
thisclean:
- -rm -f dropbear dbclient dropbearkey dropbearconvert scp scp-progress \
- dropbearmulti *.o *.da *.bb *.bbg *.prof
+ -rm -f dropbear$(EXEEXT) dbclient$(EXEEXT) dropbearkey$(EXEEXT) \
+ dropbearconvert$(EXEEXT) scp$(EXEEXT) scp-progress$(EXEEXT) \
+ dropbearmulti$(EXEEXT) *.o *.da *.bb *.bbg *.prof
distclean: clean tidy
-rm -f config.h