html5/markup .cvsignore,1.16,1.17 Makefile,1.73,1.74

Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv3153

Modified Files:
	.cvsignore Makefile 
Log Message:
makefile tweaks to streamline the doc build


Index: .cvsignore
===================================================================
RCS file: /sources/public/html5/markup/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- .cvsignore	14 Jul 2009 16:30:15 -0000	1.16
+++ .cvsignore	29 Jul 2009 09:36:26 -0000	1.17
@@ -16,3 +16,4 @@
 named.html
 writing.html
 html.css.LICENSE.xml
+LICENSE.xml

Index: Makefile
===================================================================
RCS file: /sources/public/html5/markup/Makefile,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- Makefile	29 Jul 2009 08:44:43 -0000	1.73
+++ Makefile	29 Jul 2009 09:36:26 -0000	1.74
@@ -57,18 +57,18 @@
 $(HTML_COMPILED_RNG).combined: $(HTML_COMPILED_RNG) tools/combine.xsl
 	$(XSLTPROC) $(XSLTPROCFLAGS) tools/combine.xsl $< > $@
 
-schema.rnc: $(HTML_COMPILED_RNG).combined
-	$(TRANG) $(TRANGFLAGS) -I rng -O rnc $< $@.tmp
-	# do correction for trang problem that creates undesirable
-	# newlines before annotations
-	$(PERL) $(PERLFLAGS) -p -e 'undef $$/; s/#\n\s*\n(\s*)#/#\n$$1#/g' $@.tmp > $@
+#schema.rnc: $(HTML_COMPILED_RNG).combined
+#	$(TRANG) $(TRANGFLAGS) -I rng -O rnc $< $@.tmp
+#	# do correction for trang problem that creates undesirable
+#	# newlines before annotations
+#	$(PERL) $(PERLFLAGS) -p -e 'undef $$/; s/#\n\s*\n(\s*)#/#\n$$1#/g' $@.tmp > $@
 
-html.rnc.xml: schema.rnc
-	echo "<schema>" > $@
-	$(PERL) $(PERLFLAGS) -p -e "s/&/&amp;/g" $< | $(PERL) $(PERLFLAGS) -p -e "s/</&lt;/g" >> $@
-	echo "</schema>" >> $@
+#html.rnc.xml: schema.rnc
+#	echo "<schema>" > $@
+#	$(PERL) $(PERLFLAGS) -p -e "s/&/&amp;/g" $< | $(PERL) $(PERLFLAGS) -p -e "s/</&lt;/g" >> $@
+#	echo "</schema>" >> $@
 
-schema/LICENSE.xml: schema/LICENSE
+LICENSE.xml: schema/LICENSE
 	echo "<license>" > $@
 	$(PERL) $(PERLFLAGS) -p -e "s/&/&amp;/g" $< | $(PERL) $(PERLFLAGS) -p -e "s/</&lt;/g" >> $@
 	echo "</license>" >> $@
@@ -111,10 +111,10 @@
 
 html.spec.src.html: $(HTML_COMPILED_RNG) html.rnc.spec.html \
   tools/generate-spec-source.xsl $(HTML_RNC_SOURCE)/assertions.sch \
-  html.rnc.xml src/head.html src/header.src.html src/intro-scope.html \
+  src/head.html src/header.src.html src/intro-scope.html \
   src/conformance.html src/structure.html src/terms.html src/syntax.html src/documents.html \
   $(ELEMENTS) src/attributes.html src/datatypes.html src/references.html \
-  schema/LICENSE.xml html.css.xml html.css.LICENSE.xml
+  LICENSE.xml html.css.xml html.css.LICENSE.xml
 	$(XSLTPROC) $(XSLTPROCFLAGS) tools/generate-spec-source.xsl $< > $@
 
 Overview.html: html.spec.src.html src/status.html tools/specgen.xsl tools/toc.xsl tools/chunker.xsl
@@ -133,8 +133,6 @@
 
 clean:
 	$(RM) -r $(HTML_RNC_SOURCE)
-	$(RM) schema.rnc.tmp
-	$(RM) html.rnc.xml
 	$(RM) html.rnc.spec.html
 	$(RM) html.css
 	$(RM) html.css.LICENSE.xml

Received on Wednesday, 29 July 2009 09:36:42 UTC