--- psiconv/trunk/formats/Makefile.am	1999/10/03 21:10:47	2
+++ psiconv/trunk/formats/Makefile.am	2004/02/04 17:37:10	202
@@ -2,7 +2,9 @@
            psion/ASCII_Codes.psi \
            psion/Basic_Elements.psi \
            psion/Basic_Structures.psi \
+           psion/Clip_Art_File.psi \
            psion/Embedded_Object_Section.psi \
+           psion/File_Structure.psi \
            psion/Fonts.psi \
            psion/Header_Section.psi \
            psion/Identifiers.psi \
@@ -15,7 +17,25 @@
            psion/Password_Section.psi \
            psion/Record_File.psi \
            psion/Record_Section.psi \
+           psion/Section_Table_Offset_Section.psi \
            psion/Section_Table_Section.psi \
+           psion/Sheet_Basic_Structures.psi \
+           psion/Sheet_Cell_List.psi \
+	   psion/Sheet_File.psi \
+           psion/Sheet_Formula_List.psi \
+           psion/Sheet_Graph_Description.psi \
+           psion/Sheet_Graph_List_Section.psi \
+           psion/Sheet_Graph_Region.psi \
+           psion/Sheet_Graph_Section.psi \
+           psion/Sheet_Grid_Section.psi \
+           psion/Sheet_Info_Section.psi \
+           psion/Sheet_Line_Section.psi \
+           psion/Sheet_Name_Section.psi \
+           psion/Sheet_Status_Section.psi \
+           psion/Sheet_Variable_List.psi \
+           psion/Sheet_Workbook_Section.psi \
+           psion/Sheet_Worksheet.psi \
+           psion/Sheet_Worksheet_List.psi \
            psion/Sketch_File.psi \
            psion/Sketch_Section.psi \
            psion/Substitutions.psi \
@@ -23,23 +43,32 @@
            psion/TextEd_Section.psi \
            psion/Text_Layout_Section.psi \
            psion/Text_Section.psi \
+           psion/Userdic_File.psi \
            psion/Word_File.psi \
            psion/Word_Status_Section.psi \
-           psion/Word_Styles_Section.psi 
+           psion/Word_Styles_Section.psi \
+           psion/World_Data_File.psi
 
-EXTRA_DIST=$(GENERATE) generate_ascii.sh generate_html.sh generate_html4.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
+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
@@ -47,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) 
@@ -55,7 +87,10 @@
 	mkdir ascii
 	./generate_ascii.sh .. ascii $(GENERATE) 
 	touch .touch-ascii
+
+ASCIIDOCFILES=$(patsubst %.psi,%.ascii,$(patsubst psion/%,ascii/%,$(GENERATE)))
+$(ASCIIDOCFILES): .touch-ascii
 endif
 
 clean-local:
-	rm -rf html html4 ascii .touch-*
+	rm -rf xhtml html4 ascii .touch-*