JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Makefile.in: Add rule to rebuild Makefile if Makefile.in changes.

Browse Source 
Include Makefile.dep last.
	(Makefile.dep): Run xidepend within source dir.  Temporarily drop
	faq.xml from dependencies.
	* xidepend: Fix creating base filename to accommodate VPATH.
This commit is contained in:
Corinna Vinschen 2013-06-04 11:50:41 +00:00
parent a0238d7084
commit c0096b6069
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/doc/ChangeLog
View File

@ -1,3 +1,11 @@
2013-06-04 Corinna Vinschen <corinna@vinschen.de>
* Makefile.in: Add rule to rebuild Makefile if Makefile.in changes.
Include Makefile.dep last.
(Makefile.dep): Run xidepend within source dir. Temporarily drop
faq.xml from dependencies.
* xidepend: Fix creating base filename to accommodate VPATH.
2013-06-04 Corinna Vinschen <corinna@vinschen.de> 2013-06-04 Corinna Vinschen <corinna@vinschen.de>
* new-features.xml (ov-new1.7.19): Align mandatory locking text to * new-features.xml (ov-new1.7.19): Align mandatory locking text to

12
winsup/doc/Makefile.in
View File

@ -21,7 +21,6 @@ exeext:=@build_exeext@
XMLTO:=xmlto --skip-validation --with-dblatex XMLTO:=xmlto --skip-validation --with-dblatex
include $(srcdir)/../Makefile.common include $(srcdir)/../Makefile.common
-include $(srcdir)/Makefile.dep
FAQ_SOURCES:= $(wildcard ${srcdir}/faq*.xml) FAQ_SOURCES:= $(wildcard ${srcdir}/faq*.xml)
@ -38,6 +37,9 @@ all: Makefile Makefile.dep \
cygwin-ug-net/cygwin-ug-net.pdf \ cygwin-ug-net/cygwin-ug-net.pdf \
cygwin-api/cygwin-api.pdf cygwin-api/cygwin-api.pdf
Makefile: ${srcdir}/Makefile.in
/bin/sh ./config.status
clean: clean:
rm -f Makefile.dep rm -f Makefile.dep
rm -f doctool.exe doctool.o rm -f doctool.exe doctool.o
@ -87,5 +89,9 @@ tarball : cygwin-docs.tar.bz2
cygwin-docs.tar.bz2 : $(TBFILES) $(TBDEPS) cygwin-docs.tar.bz2 : $(TBFILES) $(TBDEPS)
find $(TBFILES) $(TBDIRS) \! -type d | sort | tar -T - -cf - | bzip2 > cygwin-docs.tar.bz2 find $(TBFILES) $(TBDIRS) \! -type d | sort | tar -T - -cf - | bzip2 > cygwin-docs.tar.bz2
Makefile.dep: cygwin-ug-net.xml faq.xml Makefile.dep: cygwin-ug-net.xml
$(srcdir)/xidepend $^ > $@ builddir=`pwd` \
&& cd $(srcdir) \
&& $(srcdir)/xidepend $^ > "$${builddir}/$@"
-include Makefile.dep

2
winsup/doc/xidepend
View File

@ -14,7 +14,7 @@ do
if fgrep -q 'xi:include' "$f" if fgrep -q 'xi:include' "$f"
then then
# This file uses XIncludes. Let's chase its deps recursively. # This file uses XIncludes. Let's chase its deps recursively.
base=`echo $f | sed -e s/\.xml//` base=`basename "$f" .xml`
if [ $subproc -eq 0 ] ; then echo -n "$base/$base.html:" ; fi if [ $subproc -eq 0 ] ; then echo -n "$base/$base.html:" ; fi
deps=`grep 'xi:include.*href' "$f" | cut -f2 -d\" | tr '\n' ' '` deps=`grep 'xi:include.*href' "$f" | cut -f2 -d\" | tr '\n' ' '`