--- psiconv/trunk/formats/Makefile.am	2003/11/11 18:58:55	152
+++ psiconv/trunk/formats/Makefile.am	2004/02/02 21:56:48	193
@@ -49,25 +49,25 @@
            psion/Word_Styles_Section.psi \
            psion/World_Data_File.psi
 
-EXTRA_DIST=$(GENERATE) generate_ascii.sh generate_html.sh generate_html4.sh \
-           generate_rtf.sh html_links.sh index_html.sh 
+EXTRA_DIST=$(GENERATE) generate_ascii.sh generate_xhtml.sh generate_html4.sh \
+           html_links.sh index_html.sh 
 
-nobase_pkgdata_DATA=$(HTMLDOCFILES) $(HTML4DOCFILES) $(ASCIIDOCFILES) \
-	            $(RTFDOCFILES) $(PSIONFILES)
+nobase_pkgdata_DATA=$(XHTMLDOCFILES) $(HTML4DOCFILES) $(ASCIIDOCFILES) \
+	            $(PSIONFILES)
 
-all-local: .touch-html .touch-html4 .touch-ascii .touch-rtf
+all-local: .touch-xhtml .touch-html4 .touch-ascii 
 
 PSIONFILES=$(GENERATE)
 
-.touch-html: $(GENERATE) 
-if HTMLDOCS
-	rm -rf html
-	mkdir html
-	./generate_html.sh .. html $(GENERATE) 
-	touch .touch-html
+.touch-xhtml: $(GENERATE) 
+if XHTMLDOCS
+	rm -rf xhtml
+	mkdir xhtml
+	./generate_xhtml.sh .. xhtml $(GENERATE) 
+	touch .touch-xhtml
 
-HTMLDOCFILES=$(patsubst %.psi,%.html,$(patsubst psion/%,html/%,$(GENERATE)))
-$(HTMLDOCFILES): .touch-html
+XHTMLDOCFILES=$(patsubst %.psi,%.html,$(patsubst psion/%,xhtml/%,$(GENERATE)))
+$(XHTMLDOCFILES): .touch-xhtml
 endif
 
 .touch-html4: $(GENERATE) 
@@ -92,16 +92,5 @@
 $(ASCIIDOCFILES): .touch-ascii
 endif
 
-.touch-rtf: $(GENERATE) 
-if RTFDOCS
-	rm -rf rtf
-	mkdir rtf
-	./generate_rtf.sh .. rtf $(GENERATE) 
-	touch .touch-rtf
-
-RTFDOCFILES=$(patsubst %.psi,%.rtf,$(patsubst psion/%,rtf/%,$(GENERATE)))
-$(RTFDOCFILES): .touch-rtf
-endif
-
 clean-local:
-	rm -rf html html4 ascii rtf .touch-*
+	rm -rf xhtml html4 ascii .touch-*