--- psiconv/trunk/lib/psiconv/Makefile.in	2000/12/28 15:49:12	86
+++ psiconv/trunk/lib/psiconv/Makefile.in	2001/06/17 18:44:28	116
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -62,6 +62,8 @@
 AS = @AS@
 CC = @CC@
 DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+EXEEXT = @EXEEXT@
 IMAGEMAGICK = @IMAGEMAGICK@
 INT_16_BIT = @INT_16_BIT@
 INT_32_BIT = @INT_32_BIT@
@@ -71,21 +73,23 @@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
+STRIP = @STRIP@
 VERSION = @VERSION@
 cflags_set = @cflags_set@
 
 INCLUDES = -I.. -I../../compat
 
 lib_LTLIBRARIES = libpsiconv.la
-libpsiconv_la_SOURCES = error.c misc.c checkuid.c list.c buffer.c data.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                         generate_simple.c generate_layout.c generate_driver.c                         generate_common.c generate_texted.c generate_page.c                         generate_word.c generate_image.c
+libpsiconv_la_SOURCES = error.c misc.c checkuid.c list.c buffer.c data.c                         parse_common.c parse_driver.c parse_formula.c                         parse_layout.c parse_image.c parse_page.c                          parse_simple.c parse_texted.c parse_word.c 			parse_sheet.c                         generate_simple.c generate_layout.c generate_driver.c                         generate_common.c generate_texted.c generate_page.c                         generate_word.c generate_image.c
 
-libpsiconv_la_LDFLAGS = -version-info 5:0:1
+libpsiconv_la_LDFLAGS = -version-info 7:0:2
 libpsiconv_la_LIBADD = ../../compat/libcompat.la
 
 psiconvincludedir = $(includedir)/psiconv
-psiconvinclude_HEADERS = data.h parse.h list.h parse_routines.h error.h                          generate_routines.h generate.h common.h
+psiconvinclude_HEADERS = data.h parse.h list.h parse_routines.h error.h                          generate_routines.h generate.h common.h buffer.h
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
@@ -99,11 +103,11 @@
 LIBS = @LIBS@
 libpsiconv_la_DEPENDENCIES =  ../../compat/libcompat.la
 libpsiconv_la_OBJECTS =  error.lo misc.lo checkuid.lo list.lo buffer.lo \
-data.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 \
-generate_simple.lo generate_layout.lo generate_driver.lo \
-generate_common.lo generate_texted.lo generate_page.lo generate_word.lo \
-generate_image.lo
+data.lo parse_common.lo parse_driver.lo parse_formula.lo \
+parse_layout.lo parse_image.lo parse_page.lo parse_simple.lo \
+parse_texted.lo parse_word.lo parse_sheet.lo generate_simple.lo \
+generate_layout.lo generate_driver.lo generate_common.lo \
+generate_texted.lo generate_page.lo generate_word.lo generate_image.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)
@@ -122,15 +126,16 @@
 .deps/generate_common.P .deps/generate_driver.P .deps/generate_image.P \
 .deps/generate_layout.P .deps/generate_page.P .deps/generate_simple.P \
 .deps/generate_texted.P .deps/generate_word.P .deps/list.P .deps/misc.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
+.deps/parse_common.P .deps/parse_driver.P .deps/parse_formula.P \
+.deps/parse_image.P .deps/parse_layout.P .deps/parse_page.P \
+.deps/parse_sheet.P .deps/parse_simple.P .deps/parse_texted.P \
+.deps/parse_word.P
 SOURCES = $(libpsiconv_la_SOURCES)
 OBJECTS = $(libpsiconv_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .lo .o .s
+.SUFFIXES: .S .c .lo .o .obj .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/psiconv/Makefile
 
@@ -166,6 +171,11 @@
 	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
 	done
 
+# FIXME: We should only use cygpath when building on Windows,
+# and only if it is available.
+.c.obj:
+	$(COMPILE) -c `cygpath -w $<`
+
 .s.o:
 	$(COMPILE) -c $<
 
@@ -174,6 +184,7 @@
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
+	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
@@ -258,7 +269,7 @@
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \