summaryrefslogtreecommitdiffhomepage
path: root/Makefile.in
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2018-02-14 00:17:30 +0800
committerMatt Johnston <matt@ucc.asn.au>2018-02-14 00:17:30 +0800
commit93632660bb08c74a6942430b90a161f7205fad3d (patch)
treeca9c37e39147ada3d6b9c407fd51564f5bb15ea0 /Makefile.in
parent84d415fb66f878798a4658f27ae27a6c21842931 (diff)
update some dependencies
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in23
1 files changed, 11 insertions, 12 deletions
diff --git a/Makefile.in b/Makefile.in
index 74f3965..8c2b7c7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,6 +25,7 @@ endif
ifneq ($(wildcard localoptions.h),)
CFLAGS+=-DLOCALOPTIONS_H_EXISTS
+LOCALOPTIONS_H=localoptions.h
endif
COMMONOBJS=dbutil.o buffer.o dbhelpers.o \
@@ -56,13 +57,6 @@ CONVERTOBJS=dropbearconvert.o keyimport.o
SCPOBJS=scp.o progressmeter.o atomicio.o scpmisc.o compat.o
-HEADERS=options.h dbutil.h session.h packet.h algo.h ssh.h buffer.h kex.h \
- dss.h bignum.h signkey.h rsa.h dbrandom.h service.h auth.h \
- debug.h channel.h chansession.h config.h queue.h sshpty.h \
- termcodes.h gendss.h genrsa.h runopts.h includes.h \
- loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \
- listener.h fake-rfc2553.h ecc.h ecdsa.h
-
dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS)
dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS)
dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS)
@@ -127,6 +121,10 @@ endif
all: $(TARGETS)
+# a bit lazy, but safer
+HEADERS=$(wildcard $(srcdir)/*.h *.h)
+*.o: $(HEADERS)
+
strip: $(TARGETS)
$(STRIP) $(addsuffix $(EXEEXT), $(TARGETS))
@@ -199,10 +197,10 @@ link%:
-rm -f $*$(EXEEXT)
-ln -s dropbearmulti$(EXEEXT) $*$(EXEEXT)
-$(STATIC_LTC): options.h
+$(STATIC_LTC):
$(MAKE) -C libtomcrypt
-$(STATIC_LTM): options.h
+$(STATIC_LTM):
$(MAKE) -C libtommath
.PHONY : clean sizes thisclean distclean tidy ltc-clean ltm-clean
@@ -233,6 +231,7 @@ tidy:
# default_options.h is stored in version control, could not find a workaround
# for parallel "make -j" and dependency rules.
default_options.h: default_options.h.in
- echo "/*\n > > > Do not edit this file (default_options.h) < < <\nGenerated from "$^"\nLocal customisation goes in localoptions.h\n*/\n\n" > $@.tmp
- $(srcdir)/ifndef_wrapper.sh < $^ >> $@.tmp
- mv $@.tmp $@
+ @echo Creating $@
+ @echo "/*\n > > > Do not edit this file (default_options.h) < < <\nGenerated from "$^"\nLocal customisation goes in localoptions.h\n*/\n\n" > $@.tmp
+ @$(srcdir)/ifndef_wrapper.sh < $^ >> $@.tmp
+ @mv $@.tmp $@