--- psiconv/trunk/program/extra/Makefile.in	2001/03/11 20:06:45	115
+++ psiconv/trunk/program/extra/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@
 
@@ -84,6 +88,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
+noinst_PROGRAMS =  checkuid$(EXEEXT) rewrite$(EXEEXT) empty$(EXEEXT)
 PROGRAMS =  $(noinst_PROGRAMS)
 
 
@@ -92,16 +97,16 @@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 checkuid_SOURCES = checkuid.c
-checkuid_OBJECTS =  checkuid.o
+checkuid_OBJECTS =  checkuid.$(OBJEXT)
 checkuid_LDADD = $(LDADD)
 checkuid_DEPENDENCIES = 
 checkuid_LDFLAGS = 
 rewrite_SOURCES = rewrite.c
-rewrite_OBJECTS =  rewrite.o
+rewrite_OBJECTS =  rewrite.$(OBJEXT)
 rewrite_DEPENDENCIES =  ../lib/psiconv/libpsiconv.la
 rewrite_LDFLAGS = 
 empty_SOURCES = empty.c
-empty_OBJECTS =  empty.o
+empty_OBJECTS =  empty.$(OBJEXT)
 empty_DEPENDENCIES =  ../lib/psiconv/libpsiconv.la
 empty_LDFLAGS = 
 CFLAGS = @CFLAGS@
@@ -118,11 +123,11 @@
 GZIP_ENV = --best
 DEP_FILES =  .deps/checkuid.P .deps/empty.P .deps/rewrite.P
 SOURCES = checkuid.c rewrite.c empty.c
-OBJECTS = checkuid.o rewrite.o empty.o
+OBJECTS = checkuid.$(OBJEXT) rewrite.$(OBJEXT) empty.$(OBJEXT)
 
 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 extra/Makefile
 
@@ -140,6 +145,11 @@
 
 maintainer-clean-noinstPROGRAMS:
 
+# 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 $<
 
@@ -148,6 +158,7 @@
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
+	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
@@ -172,16 +183,16 @@
 
 maintainer-clean-libtool:
 
-checkuid: $(checkuid_OBJECTS) $(checkuid_DEPENDENCIES)
-	@rm -f checkuid
+checkuid$(EXEEXT): $(checkuid_OBJECTS) $(checkuid_DEPENDENCIES)
+	@rm -f checkuid$(EXEEXT)
 	$(LINK) $(checkuid_LDFLAGS) $(checkuid_OBJECTS) $(checkuid_LDADD) $(LIBS)
 
-rewrite: $(rewrite_OBJECTS) $(rewrite_DEPENDENCIES)
-	@rm -f rewrite
+rewrite$(EXEEXT): $(rewrite_OBJECTS) $(rewrite_DEPENDENCIES)
+	@rm -f rewrite$(EXEEXT)
 	$(LINK) $(rewrite_LDFLAGS) $(rewrite_OBJECTS) $(rewrite_LDADD) $(LIBS)
 
-empty: $(empty_OBJECTS) $(empty_DEPENDENCIES)
-	@rm -f empty
+empty$(EXEEXT): $(empty_OBJECTS) $(empty_DEPENDENCIES)
+	@rm -f empty$(EXEEXT)
 	$(LINK) $(empty_LDFLAGS) $(empty_OBJECTS) $(empty_LDADD) $(LIBS)
 
 tags: TAGS
@@ -226,7 +237,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 \