summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-08-19 19:12:14 +1000
committerDarren Tucker <dtucker@zip.com.au>2006-08-19 19:12:14 +1000
commitf0625699dff5e62e69b454acd9ea4c5bef7787b5 (patch)
tree943fab4975e1547acc641234dd4dc94f097cb033
parentdeccaa7d0f8e8c8cd8f1f9ebb7d02fe2f456a760 (diff)
- (dtucker) [openbsd-compat/regress/Makefile.in] Add $(EXEEXT) and add a
single rule for the test progs.
-rw-r--r--ChangeLog4
-rw-r--r--openbsd-compat/regress/Makefile.in15
2 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f956a57..e24ad344 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 22dab283..bcf214bd 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