11# Makefile to generate the CSS2 document based on its "source files"
22# Arnaud Le Hors - lehors@w3.org
3- # $Id: Makefile,v 2.54 2002-07-05 22:19:35 bbos Exp $
3+ # $Id: Makefile,v 2.55 2002-07-08 14:57:49 bbos Exp $
44
55# what needs to be set for every new release:
66# Note use of full year (1998) in identifier.
@@ -104,14 +104,10 @@ ALLOBJS= $(SPECOBJS) $(INDEXES) $(IMAGES) $(LONGDESCS) $(STYLESHEETS)
104104
105105PROPSRC = properties/properties.db
106106PROPSAMPLE = properties/sample.db
107- DESCSRC = properties/descriptors.db
108107PROPBLKSDIR = build/properties
109- DESCBLKSDIR = build/descriptors
110108
111109# dbase for property name anchors
112110PROPERTYDB = build/property.db
113- # dbase for descriptor name anchors
114- DESCRIPTORDB = build/descriptor.db
115111# dbase for value types
116112VALUEDB = build/value.db
117113# dbase for headings
@@ -123,6 +119,7 @@ SED = sed
123119# PERL= perl5 -Ibin
124120PERL = perl
125121NSGMLS =nsgmls
122+ HTMLDECL = sgml/HTML4.decl
126123LINKLINT =$(PERL ) bin/linklint
127124SPELL = ispell -l -p
128125DIFF = diff
@@ -136,7 +133,7 @@ HIPP= $(PERL) ./bin/hipp
136133HMKDEPEND = $(PERL ) ./bin/hmkdep
137134# make value anchor database
138135MKANCHDB = $(PERL ) ./bin/mkanchdb
139- # make property and descriptor anchor database
136+ # make property anchor database
140137MKPANCHDB = $(PERL ) ./bin/mkpanchdb
141138# add heading anchors
142139ADDHANCH = $(PERL ) ./bin/addhanch
@@ -148,8 +145,6 @@ ADDNAVBAR= $(PERL) ./bin/addnavbar
148145MKIDX = $(PERL ) ./bin/mkidx
149146# make property index
150147MKPROPIDX = $(PERL ) ./bin/mkpropidx
151- # make descriptor index
152- MKDESCIDX = $(PERL ) ./bin/mkdescidx
153148# make table of contents and heading database
154149MKTOC = $(PERL ) ./bin/mktoc
155150# HTML concate utility
@@ -164,8 +159,6 @@ INSAFTER= $(PERL) ./bin/insafter
164159ADDLINKS = $(PERL ) ./bin/addlinks
165160# extract properties from db.
166161PEXTR = $(PERL ) ./bin/pextr
167- # extract descriptors from db.
168- DEXTR = $(PERL ) ./bin/dextr
169162# extract issues from issues db.
170163ISSUES = bin/issues
171164# extract issues from errata-issues db.
@@ -178,7 +171,7 @@ CHKSAMPLE= $(PERL) ./bin/chksample
178171MKREFDB = $(PERL ) ./bin/mkrefdb
179172# check references.
180173CHKREFS = $(PERL ) ./bin/chkrefs
181- # check property/descriptor defs and instances
174+ # check property defs and instances
182175CHKPROPS = $(PERL ) ./bin/chkprops
183176# add reference normative/informative class info.
184177CHKSPACES = $(PERL ) ./bin/chkspaces
@@ -237,7 +230,7 @@ LN= ln
237230# %.html: %.subtoc Project.cfg
238231% .html : % .subtoc $(MAINSRCS:.src=.srd ) $(APPSRCS:.src=.srd ) Project.cfg # $(SPECSRCS:.src=.srd)
239232 @echo " =========== making" $@
240- $(ADDLINKS ) $(VALUEDB ) $* .srd propinst-/propdef- descinst-/descdef- value-inst-/value-def- | \
233+ $(ADDLINKS ) $(VALUEDB ) $* .srd propinst-/propdef- value-inst-/value-def- | \
241234 $(ADDIDXANCH ) -r $@ $(INDEXDB ) - | \
242235 $(ADDMARKUP ) - | \
243236 $(ADDLONGDESC ) - | \
@@ -252,8 +245,6 @@ LN= ln
252245 $(ADDHANCH ) -r $* .html $(HEADINGDB ) - $@
253246 $(MKANCHDB ) -r $* .html value-def- $(VALUEDB ) $@
254247 $(MKANCHDB ) -r $* .html propdef- $(VALUEDB ) $@
255- $(MKANCHDB ) -r $* .html descdef- $(VALUEDB ) $@
256- $(MKANCHDB ) -r $* .html descdef- $(VALUEDB ) $@
257248
258249.idraw.gif :
259250 $(RM ) $@
@@ -348,9 +339,9 @@ css2.zip: $(ALLOBJS)
348339 $(ZIP ) $@ $(ALLOBJS ) images/* .png
349340# $(ZIP) $@ $(ALLOBJS) `$(LS) -d images/*.png | $(GREP) -v "\."`
350341
351- # ### Section generate property/descriptor tables from property database.
342+ # ### Section generate property tables from property database.
352343
353- build/blocks.ok : $(PROPBLKSDIR ) /blocks.ok $( DESCBLKSDIR ) /blocks.ok
344+ build/blocks.ok : $(PROPBLKSDIR ) /blocks.ok
354345 touch $@
355346
356347$(PROPBLKSDIR ) /blocks.ok : $(PROPSRC )
@@ -359,21 +350,6 @@ $(PROPBLKSDIR)/blocks.ok: $(PROPSRC)
359350 $(PEXTR ) -n $(PROPSAMPLE ) $(PROPBLKSDIR )
360351 touch $@
361352
362- $(DESCBLKSDIR ) /blocks.ok : $(DESCSRC )
363- @if [ ! -d $( DESCBLKSDIR) ]; then mkdir -p $(DESCBLKSDIR ) ; fi
364- $(DEXTR ) $(DESCSRC ) $(DESCBLKSDIR )
365- touch $@
366-
367-
368- # build/value.db.ok: $(MAINSRCS) $(APPSRCS)
369- # @echo "=========== making" $@
370- # $(MKANCHDB) value-def- $(VALUEDB) $(MAINSRCS) $(APPSRCS:.src=.srd)
371- # # $(SPECSRCS:.src=.srd)
372- # $(MKANCHDB) propdef- $(VALUEDB) $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd)
373- # # $(SPECSRCS:.src=.srd)
374- # $(MKANCHDB) descdef- $(VALUEDB) $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd)
375- # # $(SPECSRCS:.src=.srd)
376- # touch $@
377353
378354cover.srd : cover.src build/contents.srb build/minicontents.srb
379355 @echo " =========== making" $@
@@ -425,27 +401,6 @@ propidx.srd:: build/propidx.srb #propidx.src
425401# @echo "=========== making" $@
426402# $(HIPP) $(INCLUDES) $< $@
427403
428- # propidx.html: propidx.srd Project.cfg
429- # @echo "=========== making" $@
430- # $(ADDHANCH) -r $*.html $(HEADINGDB) $*.srd |\
431- # $(ADDLINKS) -x $(VALUEDB) - propinst-/propdef- descinst-/descdef- value-inst-/value-def- |\
432- # $(ADDNAVBAR) -r $@ |\
433- # $(MKCHAIN) -r $@ - $@
434-
435- build/descidx.srb : $(MAINSRCS ) $(APPSRCS )
436- @echo " =========== making" $@
437- $(MKDESCIDX ) -r $@ $@ $(DESCSRC )
438-
439- descidx.srd :: build/descidx.srb # descidx.src
440- # $(HIPP) $(INCLUDES) $< $@
441-
442- # descidx.html: descidx.srd Project.cfg
443- # @echo "=========== making" $@
444- # $(ADDHANCH) -r $*.html $(HEADINGDB) $*.srd |\
445- # $(ADDLINKS) -x $(VALUEDB) - propinst-/propdef- descinst-/descdef- value-inst-/value-def- |\
446- # $(ADDNAVBAR) -r $@ |\
447- # $(MKCHAIN) -r $@ - $@
448-
449404# Issues and todo lists.
450405issues.html : issues.src build/issues.srb
451406 @echo " =========== making" $@
@@ -482,7 +437,7 @@ checkdoc: all
482437 -@echo " # Begin checking sgml."
483438 @for i in $(FILES ) $(LONGDESCS ) ; \
484439 do echo checking $$ i...; \
485- $(NSGMLS) -s -c sgml/HTML4.cat $$i; done;
440+ $(NSGMLS) -s -c sgml/HTML4.cat $(HTMLDECL) $ $i; done;
486441 -@echo "# End checking sgml."
487442
488443# ## check on the validity references in the document
@@ -524,13 +479,10 @@ checklnx: all
524479
525480# ## check property instances
526481
527- checkprops : $(SPECSRCS ) $(PROPSRC ) $( DESCSRC )
482+ checkprops : $(SPECSRCS ) $(PROPSRC )
528483 -@echo " # Begin checking properties."
529484 -@$(CHKPROPS ) $(PROPSRC ) propinst $(SPECSRCS )
530485 -@echo " # End checking properties."
531- -@echo " # Begin checking descriptors."
532- -@$(CHKPROPS ) $(DESCSRC ) descinst $(SPECSRCS )
533- -@echo " # End checking descriptors."
534486
535487# Check spaces
536488
@@ -551,7 +503,7 @@ build/checkx.out: build/xamples.ok
551503 -@echo Begin checking HTML examples.
552504 -@for i in build/?* xampl* .html ; \
553505 do echo checking $$ i...; \
554- $(NSGMLS ) -s -c sgml/HTML4.cat sgml/HTML4.decl $$ i >> build/checkx.out 2>&1 ; \
506+ $(NSGMLS ) -s -c sgml/HTML4.cat $( HTMLDECL ) $$ i >> build/checkx.out 2>&1 ; \
555507 done ;
556508 -@echo Begin checking CSS examples.
557509 $(CHKCSS ) build/?* xampl* .css >> build/checkx.out 2>&1
@@ -575,7 +527,7 @@ clean:
575527 $(RM ) $(SPECOBJS ) $(INDEXES ) $(PROPBLKSDIR ) /* \
576528 $(SPECOBJS:.html=.srd ) $(SPECOBJS:.html=.subtoc ) \
577529 $(INDEXES:.html =.srd) \
578- $( DESCBLKSDIR ) /* build/* css2.* linklint images/links.ok images/pngs.ok
530+ build/* css2.* linklint images/links.ok images/pngs.ok
579531
580532realclean : clean
581533
0 commit comments