--- psiconv/trunk/program/psiconv/Makefile.in	2001/03/11 20:06:45	115
+++ psiconv/trunk/program/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,8 +73,10 @@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
+STRIP = @STRIP@
 VERSION = @VERSION@
 cflags_set = @cflags_set@
 
@@ -88,6 +92,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
+bin_PROGRAMS =  psiconv$(EXEEXT)
 PROGRAMS =  $(bin_PROGRAMS)
 
 
@@ -95,8 +100,9 @@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-psiconv_OBJECTS =  psiconv.o gen_html.o gen_html4.o gen_txt.o gen_rtf.o \
-gen_image.o gen_latex.o magick-aux.o
+psiconv_OBJECTS =  psiconv.$(OBJEXT) gen_html.$(OBJEXT) \
+gen_html4.$(OBJEXT) gen_txt.$(OBJEXT) gen_rtf.$(OBJEXT) \
+gen_image.$(OBJEXT) gen_latex.$(OBJEXT) magick-aux.$(OBJEXT)
 psiconv_DEPENDENCIES =  ../../lib/psiconv/libpsiconv.la
 psiconv_LDFLAGS = 
 CFLAGS = @CFLAGS@
@@ -119,7 +125,7 @@
 
 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 program/psiconv/Makefile
 
@@ -153,6 +159,11 @@
 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	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 $<
 
@@ -161,6 +172,7 @@
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
+	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
@@ -185,8 +197,8 @@
 
 maintainer-clean-libtool:
 
-psiconv: $(psiconv_OBJECTS) $(psiconv_DEPENDENCIES)
-	@rm -f psiconv
+psiconv$(EXEEXT): $(psiconv_OBJECTS) $(psiconv_DEPENDENCIES)
+	@rm -f psiconv$(EXEEXT)
 	$(LINK) $(psiconv_LDFLAGS) $(psiconv_OBJECTS) $(psiconv_LDADD) $(LIBS)
 
 tags: TAGS
@@ -231,7 +243,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 \