--- psiconv/trunk/lib/psiconv/Makefile.in	1999/10/03 21:10:47	2
+++ psiconv/trunk/lib/psiconv/Makefile.in	1999/11/30 00:26:55	33
@@ -67,6 +67,7 @@
 INT_8_BIT = @INT_8_BIT@
 LD = @LD@
 LIBTOOL = @LIBTOOL@
+LIB_MAGICK = @LIB_MAGICK@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 NM = @NM@
@@ -74,17 +75,18 @@
 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                         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_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 1:0:0
+libpsiconv_la_LDFLAGS = -version-info 2: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 +98,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 list.lo parse_aux.lo parse_common.lo parse_driver.lo \
-parse_layout.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,11 +115,10 @@
 
 TAR = tar
 GZIP_ENV = --best
-DEP_FILES =  .deps/checkuid.P .deps/data.P .deps/gen_html.P \
-.deps/gen_html4.P .deps/gen_txt.P .deps/list.P .deps/parse_aux.P \
-.deps/parse_common.P .deps/parse_driver.P .deps/parse_layout.P \
-.deps/parse_page.P .deps/parse_simple.P .deps/parse_texted.P \
-.deps/parse_word.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
 SOURCES = $(libpsiconv_la_SOURCES)
 OBJECTS = $(libpsiconv_la_OBJECTS)