--- psiconv/trunk/lib/psiconv/Makefile.in	1999/10/11 15:06:57	10
+++ psiconv/trunk/lib/psiconv/Makefile.in	2000/12/10 16:13:24	57
@@ -62,29 +62,30 @@
 AS = @AS@
 CC = @CC@
 DLLTOOL = @DLLTOOL@
+IMAGEMAGICK = @IMAGEMAGICK@
 INT_16_BIT = @INT_16_BIT@
 INT_32_BIT = @INT_32_BIT@
 INT_8_BIT = @INT_8_BIT@
-LD = @LD@
 LIBTOOL = @LIBTOOL@
+LIB_MAGICK = @LIB_MAGICK@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
-NM = @NM@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
+cflags_set = @cflags_set@
 
-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                         list.c parse_aux.c parse_common.c parse_driver.c                         parse_layout.c parse_image.c parse_page.c                          parse_simple.c parse_texted.c parse_word.c 
+libpsiconv_la_SOURCES = checkuid.c data.c                         list.c parse_aux.c parse_common.c parse_driver.c                         parse_layout.c parse_image.c parse_page.c                          parse_simple.c parse_texted.c parse_word.c 
 
-libpsiconv_la_LDFLAGS = -version-info 2:0:2
+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
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES =  general.h
@@ -96,10 +97,9 @@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 libpsiconv_la_DEPENDENCIES =  ../compat/libcompat.la
-libpsiconv_la_OBJECTS =  checkuid.lo data.lo gen_html.lo gen_html4.lo \
-gen_txt.lo gen_rtf.lo list.lo parse_aux.lo parse_common.lo \
-parse_driver.lo parse_layout.lo parse_image.lo parse_page.lo \
-parse_simple.lo parse_texted.lo parse_word.lo
+libpsiconv_la_OBJECTS =  checkuid.lo data.lo list.lo parse_aux.lo \
+parse_common.lo parse_driver.lo parse_layout.lo parse_image.lo \
+parse_page.lo parse_simple.lo parse_texted.lo parse_word.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -114,8 +114,7 @@
 
 TAR = tar
 GZIP_ENV = --best
-DEP_FILES =  .deps/checkuid.P .deps/data.P .deps/gen_html.P \
-.deps/gen_html4.P .deps/gen_rtf.P .deps/gen_txt.P .deps/list.P \
+DEP_FILES =  .deps/checkuid.P .deps/data.P .deps/list.P \
 .deps/parse_aux.P .deps/parse_common.P .deps/parse_driver.P \
 .deps/parse_image.P .deps/parse_layout.P .deps/parse_page.P \
 .deps/parse_simple.P .deps/parse_texted.P .deps/parse_word.P
@@ -302,7 +301,7 @@
 install-exec-am: install-libLTLIBRARIES
 install-exec: install-exec-am
 
-install-data-am: install-psiconvincludeHEADERS
+install-data-am: install-psiconvincludeHEADERS install-data-local
 install-data: install-data-am
 
 install-am: all-am
@@ -364,12 +363,20 @@
 clean-tags maintainer-clean-tags distdir mostlyclean-depend \
 distclean-depend clean-depend maintainer-clean-depend info-am info \
 dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
+install-exec install-data-local install-data-am install-data install-am \
+install uninstall-am uninstall all-redirect all-am all installdirs \
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
+# 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; 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: