--- psiconv/trunk/lib/psiconv/Makefile.am	1999/10/04 16:38:15	5
+++ psiconv/trunk/lib/psiconv/Makefile.am	2000/12/10 16:49:40	58
@@ -1,14 +1,20 @@
-INCLUDES=-I.. 
+INCLUDES=-I.. -I../../compat
 
 lib_LTLIBRARIES = libpsiconv.la
-libpsiconv_la_SOURCES = checkuid.c data.c gen_html.c gen_html4.c gen_txt.c \
-			gen_rtf.c \
+libpsiconv_la_SOURCES = checkuid.c data.c \
                         list.c parse_aux.c parse_common.c parse_driver.c \
-                        parse_layout.c parse_page.c parse_simple.c \
-                        parse_texted.c parse_word.c 
-libpsiconv_la_LDFLAGS = -version-info 1:0:0
-libpsiconv_la_LIBADD = ../compat/libcompat.la
+                        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
+libpsiconv_la_LIBADD = ../../compat/libcompat.la
 
 psiconvincludedir = $(includedir)/psiconv
-psiconvinclude_HEADERS = data.h parse.h gen.h list.h parse_routines.h
+psiconvinclude_HEADERS = data.h parse.h list.h parse_routines.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;