2 files changed, 13 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 9f956a579..e24ad3444 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
    - djm@cvs.openbsd.org 2006/08/18 22:41:29
      [gss-genr.c]
      GSSAPI error code should be 0 and not -1; from simon@sxw.org.uk
+ - (dtucker) [openbsd-compat/regress/Makefile.in] Add $(EXEEXT) and add a
+   single rule for the test progs.
 
 20060818
  - (dtucker) [configure.ac openbsd-compat/bsd-closefrom.c] Resync with
@@ -5272,4 +5274,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4497 2006/08/18 22:50:57 djm Exp $
+$Id: ChangeLog,v 1.4498 2006/08/19 09:12:14 dtucker Exp $
diff --git a/openbsd-compat/regress/Makefile.in b/openbsd-compat/regress/Makefile.in
index 22dab2837..bcf214bd0 100644
--- a/openbsd-compat/regress/Makefile.in
+++ b/openbsd-compat/regress/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.3 2006/08/18 10:56:19 dtucker Exp $
+# $Id: Makefile.in,v 1.4 2006/08/19 09:12:14 dtucker Exp $
 
 sysconfdir=@sysconfdir@
 piddir=@piddir@
@@ -10,19 +10,24 @@ CC=@CC@
 LD=@LD@
 CFLAGS=@CFLAGS@
 CPPFLAGS=-I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@
+EXEEXT=@EXEEXT@
+LIBCOMPAT=../libopenbsd-compat.a
 LIBS=@LIBS@
-LDFLAGS=-L.. -lopenbsd-compat @LDFLAGS@
+LDFLAGS=@LDFLAGS@ $(LIBCOMPAT)
 
-LIBCOMPAT=../libopenbsd-compat.a
-TESTPROGS=closefromtest strtonumtest strduptest snprintftest
+TESTPROGS=closefromtest$(EXEEXT) snprintftest$(EXEEXT) strduptest$(EXEEXT) \
+        strtonumtest$(EXEEXT)
 
 all:    t-exec ${OTHERTESTS}
 
+%$(EXEEXT):     %.c
+        $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $< $(LIBCOMPAT) $(LIBS)
+
 t-exec: $(TESTPROGS)
         @echo running compat regress tests
         @for TEST in ""$?; do \
                 echo "run test $${TEST}" ... 1>&2; \
-                ./$${TEST} || exit $$? ; \
+                ./$${TEST}$(EXEEXT) || exit $$? ; \
         done
         @echo finished compat regress tests