Add EXTRA_DIST, replace $(srcdir) by
$(builddir) for generated files, so "make distcheck" works again. git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1104 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
parent
3e93f3d037
commit
c03387fcb1
|
@ -1,3 +1,9 @@
|
||||||
|
2012-09-06 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
|
||||||
|
|
||||||
|
* doc/Makefile.am: add EXTRA_DIST, replace $(srcdir) by
|
||||||
|
$(builddir) for generated files, so "make distcheck"
|
||||||
|
works again
|
||||||
|
|
||||||
2012-09-05 Rene Liebscher <R.Liebscher@gmx.de>
|
2012-09-05 Rene Liebscher <R.Liebscher@gmx.de>
|
||||||
|
|
||||||
* doc/Makefile.am: add $(srcdir) to name of generated files, so BSD make
|
* doc/Makefile.am: add $(srcdir) to name of generated files, so BSD make
|
||||||
|
|
|
@ -22,17 +22,20 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
GENERATED_TEXINFOS = \
|
GENERATED_TEXINFOS = \
|
||||||
$(srcdir)/programmers.texi \
|
$(builddir)/programmers.texi \
|
||||||
$(srcdir)/parts.texi \
|
$(builddir)/parts.texi \
|
||||||
$(srcdir)/programmer_types.texi \
|
$(builddir)/programmer_types.texi \
|
||||||
$(srcdir)/version.texi
|
$(builddir)/version.texi
|
||||||
|
|
||||||
CLEANFILES = \
|
CLEANFILES = \
|
||||||
$(GENERATED_TEXINFOS) \
|
$(GENERATED_TEXINFOS) \
|
||||||
stamp-vti
|
$(builddir)/stamp-vti
|
||||||
|
|
||||||
info_TEXINFOS = avrdude.texi
|
info_TEXINFOS = avrdude.texi
|
||||||
|
|
||||||
|
EXTRA_DIST = \
|
||||||
|
parts_comments.txt
|
||||||
|
|
||||||
all-local: info html ps pdf
|
all-local: info html ps pdf
|
||||||
|
|
||||||
html: avrdude-html/avrdude.html
|
html: avrdude-html/avrdude.html
|
||||||
|
@ -46,27 +49,27 @@ avrdude-html/avrdude.html: $(srcdir)/$(info_TEXINFOS) $(GENERATED_TEXINFOS)
|
||||||
mv -f avrdude avrdude-html; \
|
mv -f avrdude avrdude-html; \
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
$(srcdir)/avrdude.info: $(GENERATED_TEXINFOS)
|
$(builddir)/avrdude.info: $(GENERATED_TEXINFOS)
|
||||||
$(srcdir)/avrdude.dvi: $(GENERATED_TEXINFOS)
|
$(builddir)/avrdude.dvi: $(GENERATED_TEXINFOS)
|
||||||
$(srcdir)/avrdude.pdf: $(GENERATED_TEXINFOS)
|
$(builddir)/avrdude.pdf: $(GENERATED_TEXINFOS)
|
||||||
|
|
||||||
# if it does not exist make this first
|
# if it does not exist make this first
|
||||||
../avrdude$(EXEEXT):
|
../avrdude$(EXEEXT):
|
||||||
$(MAKE) -C .. avrdude$(EXEEXT)
|
$(MAKE) -C .. avrdude$(EXEEXT)
|
||||||
|
|
||||||
$(srcdir)/programmers.texi: ../avrdude$(EXEEXT) ../avrdude.conf Makefile
|
$(builddir)/programmers.texi: ../avrdude$(EXEEXT) ../avrdude.conf Makefile
|
||||||
../avrdude$(EXEEXT) -C ../avrdude.conf -c \? 2>&1 \
|
../avrdude$(EXEEXT) -C ../avrdude.conf -c \? 2>&1 \
|
||||||
| $(AWK) '$$2 ~ /^=$$/ {printf("@item @code{%s} @tab %s\n",$$1,gensub("[^=]+=[ \t]*","",1))}' \
|
| $(AWK) '$$2 ~ /^=$$/ {printf("@item @code{%s} @tab %s\n",$$1,gensub("[^=]+=[ \t]*","",1))}' \
|
||||||
| sed "s# *,\? *<\?\(http://[^ \t>]*\)>\?#,@*\n@url{\1}#g" \
|
| sed "s# *,\? *<\?\(http://[^ \t>]*\)>\?#,@*\n@url{\1}#g" \
|
||||||
>programmers.texi
|
>programmers.texi
|
||||||
|
|
||||||
$(srcdir)/programmer_types.texi: ../avrdude$(EXEEXT) ../avrdude.conf Makefile
|
$(builddir)/programmer_types.texi: ../avrdude$(EXEEXT) ../avrdude.conf Makefile
|
||||||
../avrdude$(EXEEXT) -C ../avrdude.conf -c \?type 2>&1 \
|
../avrdude$(EXEEXT) -C ../avrdude.conf -c \?type 2>&1 \
|
||||||
| $(AWK) '$$2 ~ /^=$$/ {printf("@item @code{%s} @tab %s\n",$$1,gensub("[^=]+=[ \t]*","",1))}' \
|
| $(AWK) '$$2 ~ /^=$$/ {printf("@item @code{%s} @tab %s\n",$$1,gensub("[^=]+=[ \t]*","",1))}' \
|
||||||
| sed "s#<\?\(http://[^ \t,>]*\)>\?#@url{\1}#g" \
|
| sed "s#<\?\(http://[^ \t,>]*\)>\?#@url{\1}#g" \
|
||||||
>programmer_types.texi
|
>programmer_types.texi
|
||||||
|
|
||||||
$(srcdir)/parts.texi: ../avrdude$(EXEEXT) ../avrdude.conf parts_comments.txt Makefile
|
$(builddir)/parts.texi: ../avrdude$(EXEEXT) ../avrdude.conf parts_comments.txt Makefile
|
||||||
../avrdude$(EXEEXT) -C ../avrdude.conf -p \? 2>&1 \
|
../avrdude$(EXEEXT) -C ../avrdude.conf -p \? 2>&1 \
|
||||||
| $(AWK) '$$2 ~ /^=$$/ {printf("@item @code{%s} @tab %s\n",$$1,$$3)}' \
|
| $(AWK) '$$2 ~ /^=$$/ {printf("@item @code{%s} @tab %s\n",$$1,$$3)}' \
|
||||||
| sed -e "`sed 's:\([^ \t]*\)[ \t]*\(.*\):s/\1$$/\1 \2/g:g' <parts_comments.txt`" \
|
| sed -e "`sed 's:\([^ \t]*\)[ \t]*\(.*\):s/\1$$/\1 \2/g:g' <parts_comments.txt`" \
|
||||||
|
|
Loading…
Reference in New Issue