--- psiconv/trunk/formats/Makefile.am	2001/07/28 13:13:57	135
+++ psiconv/trunk/formats/Makefile.am	2004/02/04 17:37:10	202
@@ -49,19 +49,26 @@
            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 \
+           html4_links.sh xhtml_links.sh index_html.sh 
 
-all-local: .touch-html .touch-html4 .touch-ascii .touch-rtf
+nobase_pkgdata_DATA=$(XHTMLDOCFILES) $(HTML4DOCFILES) $(ASCIIDOCFILES) \
+	            $(PSIONFILES)
 
-.touch-html: $(GENERATE) 
-if HTMLDOCS
-	rm -rf html
-	mkdir html
-	./generate_html.sh .. html $(GENERATE) 
-	touch .touch-html
-endif
+all-local: .touch-xhtml .touch-html4 .touch-ascii 
+
+PSIONFILES=$(GENERATE)
+
+.touch-xhtml: $(GENERATE) 
+if XHTMLDOCS
+	rm -rf xhtml
+	mkdir xhtml
+	./generate_xhtml.sh .. xhtml $(GENERATE) 
+	touch .touch-xhtml
 
+XHTMLDOCFILES=$(patsubst %.psi,%.html,$(patsubst psion/%,xhtml/%,$(GENERATE)))
+$(XHTMLDOCFILES): .touch-xhtml
+endif
 
 .touch-html4: $(GENERATE) 
 if HTML4DOCS
@@ -69,6 +76,9 @@
 	mkdir html4
 	./generate_html4.sh .. html4 $(GENERATE)
 	touch .touch-html4
+
+HTML4DOCFILES=$(patsubst %.psi,%.html,$(patsubst psion/%,html4/%,$(GENERATE)))
+$(HTML4DOCFILES): .touch-html4
 endif
 
 .touch-ascii: $(GENERATE) 
@@ -77,15 +87,10 @@
 	mkdir ascii
 	./generate_ascii.sh .. ascii $(GENERATE) 
 	touch .touch-ascii
-endif
 
-.touch-rtf: $(GENERATE) 
-if RTFDOCS
-	rm -rf rtf
-	mkdir rtf
-	./generate_rtf.sh .. rtf $(GENERATE) 
-	touch .touch-rtf
+ASCIIDOCFILES=$(patsubst %.psi,%.ascii,$(patsubst psion/%,ascii/%,$(GENERATE)))
+$(ASCIIDOCFILES): .touch-ascii
 endif
 
 clean-local:
-	rm -rf html html4 ascii rtf .touch-*
+	rm -rf xhtml html4 ascii .touch-*