Mercurial > dropbear
diff Makefile.in @ 1521:198e2ee0f4b1
- Fix dependencies and remove old default_options.h from version control
- Rename default_options.h.in -> default_options.h, and
default_options.h -> default_options_guard.h
- Fix newlines in default_options.h
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Mon, 19 Feb 2018 22:16:50 +0800 |
| parents | 2d450c1056e3 |
| children | bb8eaa26bc93 5212630893ab |
line wrap: on
line diff
--- a/Makefile.in Sun Feb 18 23:48:32 2018 +0800 +++ b/Makefile.in Mon Feb 19 22:16:50 2018 +0800 @@ -23,9 +23,10 @@ LIBTOM_LIBS=$(STATIC_LTC) $(STATIC_LTM) endif +OPTION_HEADERS = default_options_guard.h sysoptions.h ifneq ($(wildcard localoptions.h),) CFLAGS+=-DLOCALOPTIONS_H_EXISTS -LOCALOPTIONS_H=localoptions.h +OPTION_HEADERS += localoptions.h endif COMMONOBJS=dbutil.o buffer.o dbhelpers.o \ @@ -98,7 +99,6 @@ CFLAGS+= -DDROPBEAR_CLIENT endif - # these are exported so that libtomcrypt's makefile will use them export CC export CFLAGS @@ -121,9 +121,16 @@ all: $(TARGETS) -# a bit lazy, but safer -HEADERS=$(wildcard $(srcdir)/*.h *.h) -*.o: $(HEADERS) +# for simplicity assume all source depends on all headers +HEADERS=$(wildcard $(srcdir)/*.h *.h) $(OPTION_HEADERS) +%.o : %.c $(HEADERS) + $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ + +default_options_guard.h: default_options.h + @echo Creating $@ + @printf "/*\n > > > Do not edit this file (default_options_guard.h) < < <\nGenerated from "$^"\nLocal customisation goes in localoptions.h\n*/\n\n" > [email protected] + @$(srcdir)/ifndef_wrapper.sh < $^ >> [email protected] + @mv [email protected] $@ strip: $(TARGETS) $(STRIP) $(addsuffix $(EXEEXT), $(TARGETS)) @@ -197,10 +204,10 @@ -rm -f $*$(EXEEXT) -ln -s dropbearmulti$(EXEEXT) $*$(EXEEXT) -$(STATIC_LTC): +$(STATIC_LTC): $(OPTION_HEADERS) $(MAKE) -C libtomcrypt -$(STATIC_LTM): +$(STATIC_LTM): $(OPTION_HEADERS) $(MAKE) -C libtommath .PHONY : clean sizes thisclean distclean tidy ltc-clean ltm-clean @@ -224,14 +231,7 @@ distclean: clean tidy -rm -f config.h -rm -f Makefile + -rm -f default_options_guard.h tidy: -rm -f *~ *.gcov */*~ - -# 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 Creating $@ - @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] $@