2002/ws/desc/wsdl20 Makefile.base,1.75,1.76

Update of /sources/public/2002/ws/desc/wsdl20
In directory homer:/tmp/cvs-serv22323

Modified Files:
	Makefile.base 
Log Message:
Improved output
Always building components table


Index: Makefile.base
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/Makefile.base,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** Makefile.base	2 Aug 2005 07:40:13 -0000	1.75
--- Makefile.base	2 Aug 2005 08:59:23 -0000	1.76
***************
*** 49,57 ****
  all: $(WSDL20.html) $(WSDL20-z.html)
  
! ifdef COMPONENTS
! $(WSDL20.html): $(COMPONENTS) $(WSDL20.xml) $(FILES) $(XSL) valid-xml.txt	
! else
! $(WSDL20.html): $(WSDL20.xml) $(FILES) $(XSL) valid-xml.txt
! endif
  	@echo "Generating $@";\
  	$(XSLTPROC) --stringparam showZed false $(STYLESHEET) $(WSDL20.xml) > $@
--- 49,53 ----
  all: $(WSDL20.html) $(WSDL20-z.html)
  
! $(WSDL20.html): components $(WSDL20.xml) $(FILES) $(XSL) valid-xml.txt	
  	@echo "Generating $@";\
  	$(XSLTPROC) --stringparam showZed false $(STYLESHEET) $(WSDL20.xml) > $@
***************
*** 61,71 ****
  	rm $@.old
  
! $(COMPONENTS): wsdl20.xml wsdl20-adjuncts.xml wsdl20-specs.xml
! 	@echo "Generating wsdl20-defs.xml";\
  	touch $@;\
! 	$(XSLTPROC) specs2defs.xsl wsdl20-specs.xml > wsdl20-defs.xml
  	@echo "Generating $@";\
  	$(XSLTPROC) $(CTABLEXSL) $< > $@
  
  $(WSDL20-z.html): $(WSDL20.xml) $(FILES) $(XSL) valid-xml.txt $(ZXSL) ../wsdl20/non-normative.xsl
  ifdef HASZ
--- 57,76 ----
  	rm $@.old
  
! components: component-table.xml adjuncts-component-table.xml wsdl20-defs.xml
! 
! component-table.xml: wsdl20.xml
! 	@echo "Generating $@";\
  	touch $@;\
! 	$(XSLTPROC) $(CTABLEXSL) $< > $@
! 
! adjuncts-component-table.xml: wsdl20-adjuncts.xml
  	@echo "Generating $@";\
+ 	touch $@;\
  	$(XSLTPROC) $(CTABLEXSL) $< > $@
  
+ wsdl20-defs.xml: wsdl20.xml wsdl20-adjuncts.xml wsdl20-specs.xml
+ 	@echo "Generating wsdl20-defs.xml";\
+ 	$(XSLTPROC) specs2defs.xsl wsdl20-specs.xml > wsdl20-defs.xml
+ 
  $(WSDL20-z.html): $(WSDL20.xml) $(FILES) $(XSL) valid-xml.txt $(ZXSL) ../wsdl20/non-normative.xsl
  ifdef HASZ
***************
*** 93,102 ****
--- 98,110 ----
  
  $(WSDL20.ps): $(WSDL20.html) $(IMAGES) $(CSS) $(TOOLS)/latin1-conv.xsl $(TOOLS)/html2psrc
+ 	@echo "Generating $@";\
  	$(XSLTPROC) $(TOOLS)/latin1-conv.xsl $(WSDL20.html) | $(HTML2PS) -f $(TOOLS)/html2psrc > $@ || rm $@
  
  $(WSDL20.pdf): $(WSDL20.ps)
+ 	@echo "Generating $@";\
  	$(PS2PDF) $<
  
  $(WSDL20.txt): $(WSDL20.html)
+ 	@echo "Generating $@";\
  	$(RM) $@ ; \
          $(HTML2TEXT) $< > $@
***************
*** 117,122 ****
  
  validate-html: valid-html.txt
! 	@cat tidy-output.txt ;\
! 	cat valid-html.txt
  
  validate-xml: valid-xml.txt
--- 125,129 ----
  
  validate-html: valid-html.txt
! 	@cat valid-html.txt
  
  validate-xml: valid-xml.txt
***************
*** 188,192 ****
  
  directory:
! 	-mkdir -p $(PUBDIR)
  	-mkdir -p $(PUBDIR)/images
  
--- 195,200 ----
  
  directory:
! 	@echo "Installing directories";\
! 	-mkdir -p $(PUBDIR);\
  	-mkdir -p $(PUBDIR)/images
  
***************
*** 213,216 ****
--- 221,225 ----
  
  install-tr: trall directory
+ 	@echo "Installing draft";\
  	cp $(XSL) $(CSS) xmlspec.dtd $(PUBDIR);\
  	cp  $(WSDL20.pdf) $(WSDL20.ps) $(WSDL20.txt) diff.html $(PUBDIR);\
***************
*** 228,235 ****
  
  clean:
! 	rm -f *~* html2ps.dbg ./valid-html.txt ./valid-xml.txt ./checkspell.txt ./valid-links.txt ./valid-pubrules.html ./valid-types.txt ./valid-ns.html ./tidy-output.txt $(WSDL20.html) $(WSDL20-z.html) diff.html $(WSDL20.pdf) $(WSDL20.ps) $(WSDL20.txt) $(WSDL20.tex) $(PREFIX).log $(COMPONENTS)
  ifdef HASZ
  	rm -f $(WSDL20-z.html) $(WSDL20-z.pdf) $(WSDL20-z.tex)
  endif
  
! .PHONY: all install validate-html validate-xml validate-pubrules validate-types spellcheck pubinstall clean schemas directory check acknowledgements install-schemas trhtml trall altformats 
--- 237,244 ----
  
  clean:
! 	rm -f *~* html2ps.dbg ./valid-html.txt ./valid-xml.txt ./checkspell.txt ./valid-links.txt ./valid-pubrules.html ./valid-types.txt ./valid-ns.html ./tidy-output.txt $(WSDL20.html) $(WSDL20-z.html) diff.html $(WSDL20.pdf) $(WSDL20.ps) $(WSDL20.txt) $(WSDL20.tex) $(PREFIX).log component-table.xml adjuncts-component-table.xml wsdl20-defs.xml
  ifdef HASZ
  	rm -f $(WSDL20-z.html) $(WSDL20-z.pdf) $(WSDL20-z.tex)
  endif
  
! .PHONY: all install validate-html validate-xml validate-pubrules validate-types spellcheck pubinstall clean schemas directory check acknowledgements install-schemas trhtml trall altformats components

Received on Tuesday, 2 August 2005 08:59:30 UTC