--- psiconv/trunk/program/psiconv/Makefile.am	2000/11/30 20:09:13	54
+++ psiconv/trunk/program/psiconv/Makefile.am	2004/01/18 19:58:12	187
@@ -1,9 +1,13 @@
-INCLUDES=-I.. -I../lib -I../compat
+INCLUDES=-I../.. -I../../lib -I../../compat
 
 bin_PROGRAMS = psiconv
-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/libpsiconv.la @LIB_MAGICK@
-psiconv_noinstHEADERS = gen.h psiconv.h magick-aux.h
+psiconv_SOURCES = psiconv.c general.c magick-aux.c \
+		  gen_txt.c gen_image.c 
 
-EXTRA_DIST = gen.h psiconv.h magick-aux.h
+#gen_html.c gen_html4.c gen_txt.c gen_rtf.c \
+#                  gen_image.c gen_latex.c magick-aux.c general.c
+psiconv_LDADD = ../../lib/psiconv/libpsiconv.la @LIB_MAGICK@ @LIB_DMALLOC@
+psiconv_noinstHEADERS = gen.h psiconv.h magick-aux.h general.h
+man1_MANS = psiconv.man
+
+EXTRA_DIST = gen.h psiconv.h magick-aux.h general.h psiconv.man