diff Makefile.in @ 1492:bd46cf0e245a

update some dependencies
author Matt Johnston <matt@ucc.asn.au>
date Wed, 14 Feb 2018 00:17:30 +0800
parents 9b87cbe931e3
children 2d450c1056e3
line wrap: on
line diff
--- a/Makefile.in	Wed Feb 14 00:17:22 2018 +0800
+++ b/Makefile.in	Wed Feb 14 00:17:30 2018 +0800
@@ -25,6 +25,7 @@
 
 ifneq ($(wildcard localoptions.h),)
 CFLAGS+=-DLOCALOPTIONS_H_EXISTS
+LOCALOPTIONS_H=localoptions.h
 endif
 
 COMMONOBJS=dbutil.o buffer.o dbhelpers.o \
@@ -56,13 +57,6 @@
 
 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 @@
 
 all: $(TARGETS)
 
+# a bit lazy, but safer
+HEADERS=$(wildcard $(srcdir)/*.h *.h)
+*.o: $(HEADERS)
+
 strip: $(TARGETS)
 	$(STRIP) $(addsuffix $(EXEEXT), $(TARGETS))
 
@@ -199,10 +197,10 @@
 	-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 @@
 # 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" > [email protected]
-	$(srcdir)/ifndef_wrapper.sh < $^ >> [email protected]
-	mv [email protected] [email protected]
+	@echo Creating [email protected]
+	@echo "/*\n > > > Do not edit this file (default_options.h) < < <\nGenerated from "$^"\nLocal customisation goes in localoptions.h\n*/\n\n" > [email protected]
+	@$(srcdir)/ifndef_wrapper.sh < $^ >> [email protected]
+	@mv [email protected] [email protected]