--- psiconv/trunk/program/psiconv/Makefile.in	1999/10/03 21:10:47	2
+++ psiconv/trunk/program/psiconv/Makefile.in	2000/12/10 16:49:40	58
@@ -38,7 +38,7 @@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 
-top_builddir = ..
+top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
 AUTOCONF = @AUTOCONF@
@@ -62,36 +62,42 @@
 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.. -I../lib
+INCLUDES = -I../.. -I../../lib -I../../compat
 
 bin_PROGRAMS = psiconv
-psiconv_SOURCES = psiconv.c
-psiconv_LDADD = ../lib/libpsiconv.la
+psiconv_SOURCES = psiconv.c gen_html.c gen_html4.c gen_txt.c gen_rtf.c                   gen_image.c magick-aux.c
+
+psiconv_LDADD = ../../lib/psiconv/libpsiconv.la @LIB_MAGICK@
+psiconv_noinstHEADERS = gen.h psiconv.h magick-aux.h
+
+EXTRA_DIST = gen.h psiconv.h magick-aux.h
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
+CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
 PROGRAMS =  $(bin_PROGRAMS)
 
 
-DEFS = @DEFS@ -I. -I$(srcdir) -I..
+DEFS = @DEFS@ -I. -I$(srcdir) -I../..
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-psiconv_OBJECTS =  psiconv.o
-psiconv_DEPENDENCIES =  ../lib/libpsiconv.la
+psiconv_OBJECTS =  psiconv.o gen_html.o gen_html4.o gen_txt.o gen_rtf.o \
+gen_image.o magick-aux.o
+psiconv_DEPENDENCIES =  ../../lib/psiconv/libpsiconv.la
 psiconv_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -105,7 +111,8 @@
 
 TAR = tar
 GZIP_ENV = --best
-DEP_FILES =  .deps/psiconv.P
+DEP_FILES =  .deps/gen_html.P .deps/gen_html4.P .deps/gen_image.P \
+.deps/gen_rtf.P .deps/gen_txt.P .deps/magick-aux.P .deps/psiconv.P
 SOURCES = $(psiconv_SOURCES)
 OBJECTS = $(psiconv_OBJECTS)
 
@@ -113,7 +120,7 @@
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu psiconv/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu program/psiconv/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
@@ -212,14 +219,14 @@
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = psiconv
+subdir = program/psiconv
 
 distdir: $(DISTFILES)
 	here=`cd $(top_builddir) && pwd`; \
 	top_distdir=`cd $(top_distdir) && pwd`; \
 	distdir=`cd $(distdir) && pwd`; \
 	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu psiconv/Makefile
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu program/psiconv/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \