Make sure xhtml directory gets built properly

diff --git a/xsl/Makefile b/xsl/Makefile
index 23f127f8426ff962259f41c8a3cbd2e4c1f88a7c..d8969271244c3292aec435c4ab97047708cfdb5f 100644 (file)
--- a/xsl/Makefile
+++ b/xsl/Makefile
@@ -6,15 +6,24 @@ ZIPVER=
 
 DIRS=common html fo extensions
 
-.PHONY : distrib clean doc
+.PHONY : distrib clean doc xhtml
 
-all:
+all:   xhtml
        for i in $(DIRS) __bogus__; do \
                if [ $$i != __bogus__ ] ; then \
                        echo "$(MAKE) -C $$i"; $(MAKE) -C $$i; \
                fi \
        done
 
+xhtml:
+       $(MAKE) -C xhtml clean
+       rm -f xhtml/.cvsignore
+       $(MAKE) -C xhtml .cvsignore
+       rm -f xhtml/xslfiles.gen
+       touch xhtml/xslfiles.gen
+       $(MAKE) -C xhtml xslfiles.list
+       $(MAKE) -C xhtml xslfiles
+
 doc:
        $(MAKE) -C docsrc
        $(MAKE) -C doc

diff --git a/xsl/xhtml/Makefile b/xsl/xhtml/Makefile
index fb02feab3529672115f2fafb47ebf5575ca390af..440bfa88beaa4f068b19dbcd628fea4ad2343715 100644 (file)
--- a/xsl/xhtml/Makefile
+++ b/xsl/xhtml/Makefile
@@ -5,6 +5,8 @@ all: xslfiles
 include xslfiles.gen
 
 .cvsignore:
+       echo .cvsignore > .cvsignore
+       echo xslfiles.gen >> .cvsignore
        for f in ../html/*.xsl; do \
            echo `basename $$f`; \
         done >> .cvsignore
@@ -14,13 +16,36 @@ include xslfiles.gen
 xslfiles.list: .cvsignore
        echo -n "xslfiles: " > xslfiles.gen
        for f in `cat .cvsignore`; do \
-           echo -n `basename $$f`; \
-            if [ "$$f" != "xref.xsl" ]; then \
-               echo " \\"; \
-            else \
-               echo ""; \
+           if [ "$$f" != ".cvsignore" -a "$$f" != "xslfiles.gen" ]; then \
+              echo -n `basename $$f`; \
+               if [ "$$f" != "xref.xsl" ]; then \
+                  echo " \\"; \
+               else \
+                  echo ""; \
+              fi; \
             fi; \
         done >> xslfiles.gen
+       echo "" >> xslfiles.gen
+       for f in `cat .cvsignore`; do \
+           if [ "$$f" != ".cvsignore" -a "$$f" != "xslfiles.gen" ]; then \
+              echo `basename $$f`: ../html/`basename $$f`; \
+              echo -n "        $$"; \
+              echo -n "(XSLT) "; \
+              echo -n "$$"; \
+              echo -n "< html2xhtml.xsl "; \
+              echo -n "$$"; \
+              echo "@"; \
+              echo ""; \
+          fi; \
+        done >> xslfiles.gen
+
+clean:
+       rm -f *~
+       for f in *.xsl; do \
+          if [ "$$f" != "html2xhtml.xsl" ]; then \
+             rm -f $$f; \
+          fi; \
+       done
 
-%.xsl: html2xhtml.xsl
-       $(XSLT) ../html/$@ html2xhtml.xsl $@
+#%.xsl: html2xhtml.xsl
+#      $(XSLT) ../html/$@ html2xhtml.xsl $@