--- psiconv/trunk/lib/psiconv/Makefile.am	2000/12/13 16:17:54	62
+++ psiconv/trunk/lib/psiconv/Makefile.am	2003/11/22 22:17:04	163
@@ -1,20 +1,17 @@
 INCLUDES=-I.. -I../../compat
 
 lib_LTLIBRARIES = libpsiconv.la
-libpsiconv_la_SOURCES = checkuid.c data.c error.c misc.c\
-                        list.c parse_common.c parse_driver.c \
+libpsiconv_la_SOURCES = error.c misc.c checkuid.c list.c buffer.c data.c \
+                        parse_common.c parse_driver.c parse_formula.c \
                         parse_layout.c parse_image.c parse_page.c  \
-                        parse_simple.c parse_texted.c parse_word.c 
-libpsiconv_la_LDFLAGS = -version-info 4:0:0
+                        parse_simple.c parse_texted.c parse_word.c \
+			parse_sheet.c \
+                        generate_simple.c generate_layout.c generate_driver.c \
+                        generate_common.c generate_texted.c generate_page.c \
+                        generate_word.c generate_image.c
+libpsiconv_la_LDFLAGS = -version-info 6:0:0
 libpsiconv_la_LIBADD = ../../compat/libcompat.la
 
 psiconvincludedir = $(includedir)/psiconv
-psiconvinclude_HEADERS = data.h parse.h list.h parse_routines.h error.h
-
-# There must be some automake-way to do this nicer, but for now it works.
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(psiconvincludedir)
-	p=general.h; \
-	if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
-	echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(psiconvincludedir)/$$p"; \
-	$(INSTALL_DATA) $$d$$p $(DESTDIR)$(psiconvincludedir)/$$p; 
+psiconvinclude_HEADERS = data.h parse.h list.h parse_routines.h error.h \
+                         generate_routines.h generate.h common.h buffer.h