Some code factorization: towards a frame-free site.

diff --git a/helm/mowgli/home/html/Makefile b/helm/mowgli/home/html/Makefile
index a8fb04c5023ad93c7056211fd14c68fa79cdbac8..f5e95f08c9817883dd8c1703a5f4dcbbbf1fef19 100644 (file)
--- a/helm/mowgli/home/html/Makefile
+++ b/helm/mowgli/home/html/Makefile
@@ -9,6 +9,8 @@ XSLROOT = ../xsl
 
 RMDOCTYPE = "s/<\\!DOCTYPE[^>]*>//"
 
+XHTMLCONTENT = $(XSLROOT)/xhtml-content.xsl
+
 PEOPLE = \
        people/aei/kelley.html \
        people/aei/schutz.html \
@@ -129,10 +131,10 @@ home.html: $(XMLROOT)/home.xml \
           $(XMLROOT)/mowgli-events.xml \
           $(XSLROOT)/latest-news.xsl \
           $(XSLROOT)/approaching-deadlines.xsl \
-          $(XSLROOT)/xhtml-content.xsl
+           $(XHTMLCONTENT)
        $(XSLTP) -o latest-news.xml $(XSLROOT)/latest-news.xsl $(XMLROOT)/news.xml
        $(XSLTP) --param today `date +%Y%m%d` -o approaching-deadlines.xml $(XSLROOT)/approaching-deadlines.xsl $(XMLROOT)/other-events.xml
-       $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl $(XMLROOT)/home.xml
+       $(XSLTP) --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) $(XMLROOT)/home.xml
 
 index.html: $(TEMPLATESROOT)/index.html
        cp $< $@
@@ -141,112 +143,112 @@ members/ml-help-example.txt: $(TEMPLATESROOT)/ml-help-example.txt
        cp $< $@
 
 members/index.html: $(XMLROOT)/members-index.xml \
-                   $(XSLROOT)/xhtml-content.xsl
-       sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+                   $(XHTMLCONTENT)
+       sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XHTMLCONTENT) -
 
 software/index.html: $(XMLROOT)/software/index.xml \
-                    $(XSLROOT)/xhtml-content.xsl
-       $(XSLTP) --param path_to_top "'..'" -o $@ $(XSLROOT)/xhtml-content.xsl $<
+                    $(XHTMLCONTENT)
+       $(XSLTP) --param path_to_top "'..'" -o $@ $(XHTMLCONTENT) $<
 
 menu.html: $(TEMPLATESROOT)/menu.html
        cp $< $@
 
 project-management.html: $(XMLROOT)/project-management.xml \
-                        $(XSLROOT)/xhtml-content.xsl
-       sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+                         $(XHTMLCONTENT)
+       sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) -
 
 project-summary.html: $(XMLROOT)/project-summary.xml \
-                     $(XSLROOT)/xhtml-content.xsl
-       sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+                     $(XHTMLCONTENT)
+       sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) -
 
 project-objectives.html: $(XMLROOT)/project-objectives.xml \
-                        $(XSLROOT)/xhtml-content.xsl
-       sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+                        $(XHTMLCONTENT)
+       sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) -
 
 mowgli-events/kick-off.html: $(XMLROOT)/mowgli-events/kick-off.xml \
-                            $(XSLROOT)/xhtml-content.xsl
-       sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+                            $(XHTMLCONTENT)
+       sed $(RMDOCTYPE) $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XHTMLCONTENT) -
 
 people-list.html: $(XMLROOT)/people/index.xml \
                   $(XSLROOT)/people-list.xsl \
-                  $(XSLROOT)/xhtml-content.xsl 
-       $(XSLTP) $(XSLROOT)/people-list.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+                  $(XHTMLCONTENT) 
+       $(XSLTP) $(XSLROOT)/people-list.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) -
 
 consortium.html: $(XMLROOT)/consortium.xml \
                  $(XSLROOT)/consortium.xsl \
-                 $(XSLROOT)/xhtml-content.xsl 
-       $(XSLTP) $(XSLROOT)/consortium.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+                 $(XHTMLCONTENT) 
+       $(XSLTP) $(XSLROOT)/consortium.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) -
 
 project.html: $(XMLROOT)/project.xml \
               $(XSLROOT)/project.xsl \
-              $(XSLROOT)/xhtml-content.xsl 
-       $(XSLTP) $(XSLROOT)/project.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+              $(XHTMLCONTENT) 
+       $(XSLTP) $(XSLROOT)/project.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) -
 
 
 news.html: $(XMLROOT)/news.xml \
           $(XSLROOT)/news.xsl \
-           $(XSLROOT)/xhtml-content.xsl 
-       $(XSLTP) $(XSLROOT)/news.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+           $(XHTMLCONTENT) 
+       $(XSLTP) $(XSLROOT)/news.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) -
 
 
 other-events.html: $(XMLROOT)/other-events.xml \
                   $(XSLROOT)/events.xsl \
-                   $(XSLROOT)/xhtml-content.xsl 
-       $(XSLTP) --param today `date +%Y%m%d` --param events-class "'Other'" $(XSLROOT)/events.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+                   $(XHTMLCONTENT) 
+       $(XSLTP) --param today `date +%Y%m%d` --param events-class "'Other'" $(XSLROOT)/events.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) -
 
 
 mowgli-events.html: $(XMLROOT)/mowgli-events.xml \
                    $(XSLROOT)/events.xsl \
-                    $(XSLROOT)/xhtml-content.xsl 
-       $(XSLTP) --param today `date +%Y%m%d` --param events-class "'MOWGLI'" $(XSLROOT)/events.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+                    $(XHTMLCONTENT) 
+       $(XSLTP) --param today `date +%Y%m%d` --param events-class "'MOWGLI'" $(XSLROOT)/events.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) -
 
 
 deadlines.html: $(XMLROOT)/other-events.xml \
                $(XSLROOT)/deadlines.xsl \
-                $(XSLROOT)/xhtml-content.xsl 
-       $(XSLTP) --param today `date +%Y%m%d` --param events-class "'Other'" $(XSLROOT)/deadlines.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+                $(XHTMLCONTENT) 
+       $(XSLTP) --param today `date +%Y%m%d` --param events-class "'Other'" $(XSLROOT)/deadlines.xsl $< | $(XSLTP) --param path_to_top "'.'" -o $@ $(XHTMLCONTENT) -
 
 
 deliverables/%.html: $(XMLROOT)/deliverables/%.xml \
                      $(XSLROOT)/deliverable.xsl \
-                     $(XSLROOT)/xhtml-content.xsl 
-       $(XSLTP) $(XSLROOT)/deliverable.xsl $< | $(XSLTP) --param path_to_top "'../..'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+                     $(XHTMLCONTENT) 
+       $(XSLTP) $(XSLROOT)/deliverable.xsl $< | $(XSLTP) --param path_to_top "'../..'" -o $@ $(XHTMLCONTENT) -
 
 
 sites/%.html: $(XMLROOT)/sites/%.xml \
               $(XSLROOT)/site.xsl \
-              $(XSLROOT)/xhtml-content.xsl 
-       $(XSLTP) $(XSLROOT)/site.xsl $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+              $(XHTMLCONTENT) 
+       $(XSLTP) $(XSLROOT)/site.xsl $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XHTMLCONTENT) -
 
 
 people/%.html: $(XMLROOT)/people/%.xml \
                $(XSLROOT)/person.xsl \
-               $(XSLROOT)/xhtml-content.xsl 
-       $(XSLTP) $(XSLROOT)/person.xsl $< | $(XSLTP) --param path_to_top "'../..'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+               $(XHTMLCONTENT) 
+       $(XSLTP) $(XSLROOT)/person.xsl $< | $(XSLTP) --param path_to_top "'../..'" -o $@ $(XHTMLCONTENT) -
 
 
 publications/index.html: $(XMLROOT)/publications/index.xml \
                         $(XSLROOT)/publications-index.xsl \
-                         $(XSLROOT)/xhtml-content.xsl 
-       $(XSLTP) $(XSLROOT)/publications-index.xsl $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+                         $(XHTMLCONTENT) 
+       $(XSLTP) $(XSLROOT)/publications-index.xsl $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XHTMLCONTENT) -
 
 
 publications/%.html: $(XMLROOT)/publications/%.xml \
                      $(XSLROOT)/publication.xsl \
-                     $(XSLROOT)/xhtml-content.xsl 
-       $(XSLTP) $(XSLROOT)/publication.xsl $< | $(XSLTP) --param path_to_top "'../..'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+                     $(XHTMLCONTENT) 
+       $(XSLTP) $(XSLROOT)/publication.xsl $< | $(XSLTP) --param path_to_top "'../..'" -o $@ $(XHTMLCONTENT) -
 
 
 work-packages/index.html: $(XMLROOT)/work-packages/index.xml \
                           $(XSLROOT)/work-packages_index.xsl \
-                          $(XSLROOT)/xhtml-content.xsl 
-       $(XSLTP) $(XSLROOT)/work-packages_index.xsl $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+                          $(XHTMLCONTENT) 
+       $(XSLTP) $(XSLROOT)/work-packages_index.xsl $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XHTMLCONTENT) -
 
        
 work-packages/%.html: $(XMLROOT)/work-packages/%.xml \
                       $(XSLROOT)/work-package.xsl \
-                      $(XSLROOT)/xhtml-content.xsl 
-       $(XSLTP) $(XSLROOT)/work-package.xsl $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XSLROOT)/xhtml-content.xsl -
+                      $(XHTMLCONTENT) 
+       $(XSLTP) $(XSLROOT)/work-package.xsl $< | $(XSLTP) --param path_to_top "'..'" -o $@ $(XHTMLCONTENT) -
 
 
 clean: