Add generated header default_options.h to version control.
This is a workaround since I cannot figure how to get dependencies to work properly with "make -j"
... | @@ -161,7 +161,6 @@ inst_%: % | ... | @@ -161,7 +161,6 @@ inst_%: % |
inst_dropbearmulti: $(addprefix insmulti, $(PROGRAMS)) | inst_dropbearmulti: $(addprefix insmulti, $(PROGRAMS)) | ||
# for some reason the rule further down doesn't like $([email protected]) as a prereq. | # for some reason the rule further down doesn't like $([email protected]) as a prereq. | ||
dropbear: $(dropbearobjs) | dropbear: $(dropbearobjs) | ||
dbclient: $(dbclientobjs) | dbclient: $(dbclientobjs) | ||
... | @@ -200,21 +199,19 @@ link%: | ... | @@ -200,21 +199,19 @@ link%: |
-rm -f $*$(EXEEXT) | -rm -f $*$(EXEEXT) | ||
-ln -s dropbearmulti$(EXEEXT) $*$(EXEEXT) | -ln -s dropbearmulti$(EXEEXT) $*$(EXEEXT) | ||
$(STATIC_LTC): options.h default_options.h | $(STATIC_LTC): options.h | ||
cd libtomcrypt && $(MAKE) | $(MAKE) -C libtomcrypt | ||
$(STATIC_LTM): options.h default_options.h | |||
cd libtommath && $(MAKE) | |||
%.o: default_options.h | $(STATIC_LTM): options.h | ||
$(MAKE) -C libtommath | |||
.PHONY : clean sizes thisclean distclean tidy ltc-clean ltm-clean | .PHONY : clean sizes thisclean distclean tidy ltc-clean ltm-clean | ||
ltc-clean: | ltc-clean: | ||
cd libtomcrypt && $(MAKE) clean | $(MAKE) -C libtomcrypt clean | ||
ltm-clean: | ltm-clean: | ||
cd libtommath && $(MAKE) clean | $(MAKE) -C libtommath clean | ||
sizes: dropbear | sizes: dropbear | ||
objdump -t dropbear|grep ".text"|cut -d "." -f 2|sort -rn | objdump -t dropbear|grep ".text"|cut -d "." -f 2|sort -rn | ||
... | @@ -223,7 +220,7 @@ clean: ltc-clean ltm-clean thisclean | ... | @@ -223,7 +220,7 @@ clean: ltc-clean ltm-clean thisclean |
thisclean: | thisclean: | ||
-rm -f dropbear dbclient dropbearkey dropbearconvert scp scp-progress \ | -rm -f dropbear dbclient dropbearkey dropbearconvert scp scp-progress \ | ||
dropbearmulti *.o *.da *.bb *.bbg *.prof default_options.h | dropbearmulti *.o *.da *.bb *.bbg *.prof | ||
distclean: clean tidy | distclean: clean tidy | ||
-rm -f config.h | -rm -f config.h | ||
... | @@ -232,7 +229,10 @@ distclean: clean tidy | ... | @@ -232,7 +229,10 @@ distclean: clean tidy |
tidy: | tidy: | ||
-rm -f *~ *.gcov */*~ | -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 | default_options.h: default_options.h.in | ||
echo "# > > > Generated from $^, edit that file instead !" > [email protected] | echo "# > > > Generated from $^, edit that file instead !" > [email protected].tmp | ||
echo >> [email protected] | echo >> [email protected].tmp | ||
$(srcdir)/ifndef_wrapper.sh < $^ > [email protected] | $(srcdir)/ifndef_wrapper.sh < $^ > [email protected].tmp | ||
mv [email protected].tmp [email protected] |
default_options.h
0 → 100644
Please register or sign in to comment