summaryrefslogtreecommitdiffstats
path: root/src/tests
diff options
context:
space:
mode:
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/asn.1/Makefile.in22
-rw-r--r--src/tests/create/Makefile.in4
-rw-r--r--src/tests/gss-threads/ChangeLog4
-rw-r--r--src/tests/gss-threads/Makefile.in6
-rw-r--r--src/tests/gss-threads/gss-misc.c2
-rw-r--r--src/tests/hammer/Makefile.in4
-rw-r--r--src/tests/misc/ChangeLog7
-rw-r--r--src/tests/misc/Makefile.in3
-rw-r--r--src/tests/misc/test_getpw.c2
-rw-r--r--src/tests/misc/test_getsockname.c2
-rw-r--r--src/tests/resolve/Makefile.in2
-rw-r--r--src/tests/shlib/ChangeLog4
-rw-r--r--src/tests/shlib/Makefile.in2
-rw-r--r--src/tests/shlib/t_loader.c2
-rw-r--r--src/tests/verify/Makefile.in4
15 files changed, 42 insertions, 28 deletions
diff --git a/src/tests/asn.1/Makefile.in b/src/tests/asn.1/Makefile.in
index bbdc4bfc40..3ddc3137db 100644
--- a/src/tests/asn.1/Makefile.in
+++ b/src/tests/asn.1/Makefile.in
@@ -65,35 +65,35 @@ ktest_equal.o: ktest_equal.h
# the Makefile.in file
#
$(OUTPRE)krb5_encode_test.$(OBJEXT): krb5_encode_test.c \
- $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
- $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \
+ $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \
+ $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \
$(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \
$(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \
$(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \
- $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \
+ $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \
utility.h $(SRCTOP)/lib/krb5/asn.1/krbasn1.h $(SRCTOP)/lib/krb5/asn.1/asn1buf.h \
ktest.h debug.h
$(OUTPRE)ktest.$(OBJEXT): ktest.c ktest.h $(SRCTOP)/include/k5-int.h \
- $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
+ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \
$(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
$(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \
+ $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \
$(SRCTOP)/include/k5-plugin.h utility.h $(SRCTOP)/lib/krb5/asn.1/krbasn1.h \
$(SRCTOP)/lib/krb5/asn.1/asn1buf.h
$(OUTPRE)ktest_equal.$(OBJEXT): ktest_equal.c ktest_equal.h \
- $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
- $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \
+ $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \
+ $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \
$(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \
$(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \
$(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \
- $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h
+ $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h
$(OUTPRE)utility.$(OBJEXT): utility.c utility.h $(SRCTOP)/lib/krb5/asn.1/krbasn1.h \
- $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \
- $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \
+ $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \
+ $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \
$(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \
$(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \
$(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \
- $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \
+ $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \
$(SRCTOP)/lib/krb5/asn.1/asn1buf.h
$(OUTPRE)trval.$(OBJEXT): trval.c
diff --git a/src/tests/create/Makefile.in b/src/tests/create/Makefile.in
index 5a628fcf52..175bc0f1f5 100644
--- a/src/tests/create/Makefile.in
+++ b/src/tests/create/Makefile.in
@@ -25,9 +25,9 @@ clean::
# the Makefile.in file
#
$(OUTPRE)kdb5_mkdums.$(OBJEXT): kdb5_mkdums.c $(SRCTOP)/include/k5-int.h \
- $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
+ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \
$(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
$(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \
+ $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \
$(SRCTOP)/include/k5-plugin.h $(SS_DEPS)
diff --git a/src/tests/gss-threads/ChangeLog b/src/tests/gss-threads/ChangeLog
index ae92cd9262..1c8a3bb3da 100644
--- a/src/tests/gss-threads/ChangeLog
+++ b/src/tests/gss-threads/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-11 Ken Raeburn <raeburn@mit.edu>
+
+ * gss-misc.c: Don't get autoconf.h from krb5/.
+
2005-06-20 Ken Raeburn <raeburn@mit.edu>
* Makefile.in (gss-client, gss-server): Use THREAD_LINKOPTS
diff --git a/src/tests/gss-threads/Makefile.in b/src/tests/gss-threads/Makefile.in
index 827399ee91..727a3ad106 100644
--- a/src/tests/gss-threads/Makefile.in
+++ b/src/tests/gss-threads/Makefile.in
@@ -43,12 +43,12 @@ install-unix::
#
$(OUTPRE)gss-client.$(OBJEXT): gss-client.c $(BUILDTOP)/include/gssapi/gssapi_generic.h \
$(BUILDTOP)/include/gssapi/gssapi.h gss-misc.h $(SRCTOP)/include/port-sockets.h \
- $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/fake-addrinfo.h \
+ $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/fake-addrinfo.h \
$(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-platform.h \
$(SRCTOP)/include/k5-thread.h
-$(OUTPRE)gss-misc.$(OBJEXT): gss-misc.c $(BUILDTOP)/include/krb5/autoconf.h \
+$(OUTPRE)gss-misc.$(OBJEXT): gss-misc.c $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/gssapi/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \
gss-misc.h
$(OUTPRE)gss-server.$(OBJEXT): gss-server.c $(BUILDTOP)/include/gssapi/gssapi_generic.h \
$(BUILDTOP)/include/gssapi/gssapi.h gss-misc.h $(SRCTOP)/include/port-sockets.h \
- $(BUILDTOP)/include/krb5/autoconf.h
+ $(BUILDTOP)/include/autoconf.h
diff --git a/src/tests/gss-threads/gss-misc.c b/src/tests/gss-threads/gss-misc.c
index 3405275fa5..3016db2208 100644
--- a/src/tests/gss-threads/gss-misc.c
+++ b/src/tests/gss-threads/gss-misc.c
@@ -57,7 +57,7 @@ static char *rcsid = "$Header$";
#include <sys/socket.h>
#endif
#include <errno.h>
-#include "krb5/autoconf.h"
+#include "autoconf.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
diff --git a/src/tests/hammer/Makefile.in b/src/tests/hammer/Makefile.in
index bcbdf821e0..ca873dea45 100644
--- a/src/tests/hammer/Makefile.in
+++ b/src/tests/hammer/Makefile.in
@@ -23,9 +23,9 @@ clean::
# the Makefile.in file
#
$(OUTPRE)kdc5_hammer.$(OBJEXT): kdc5_hammer.c $(SRCTOP)/include/k5-int.h \
- $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
+ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \
$(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
$(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \
+ $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \
$(SRCTOP)/include/k5-plugin.h
diff --git a/src/tests/misc/ChangeLog b/src/tests/misc/ChangeLog
index 559980a1f9..035fbee960 100644
--- a/src/tests/misc/ChangeLog
+++ b/src/tests/misc/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-11 Ken Raeburn <raeburn@mit.edu>
+
+ * test_getsockname.c, test_getpw.c: Don't get autoconf.h from
+ krb5/.
+ * Makefile.in (test_getpw.$(OBJEXT)): Drop explicit dependencies
+ outside of "make depend" section.
+
2005-11-28 Ken Raeburn <raeburn@mit.edu>
* Makefile.in (test_getpw.$(OBJEXT)): New intermediate target.
diff --git a/src/tests/misc/Makefile.in b/src/tests/misc/Makefile.in
index 3f5cf03a24..3438bf4a8d 100644
--- a/src/tests/misc/Makefile.in
+++ b/src/tests/misc/Makefile.in
@@ -16,7 +16,6 @@ check:: test_getpw
test_getpw: $(OUTPRE)test_getpw.$(OBJEXT) $(SUPPORT_DEPLIB)
$(CC_LINK) $(ALL_CFLAGS) -o test_getpw $(OUTPRE)test_getpw.$(OBJEXT) $(SUPPORT_LIB)
-test_getpw.$(OBJEXT): $(srcdir)/../misc/test_getpw.c ../../include/krb5/autoconf.h
test_getsockname: $(OUTPRE)test_getsockname.$(OBJEXT)
$(CC_LINK) $(ALL_CFLAGS) -o test_getsockname $(OUTPRE)test_getsockname.$(OBJEXT) $(LIBS)
@@ -31,5 +30,5 @@ clean::
# Makefile dependencies follow. This must be the last section in
# the Makefile.in file
#
-$(OUTPRE)test_getpw.$(OBJEXT): test_getpw.c $(BUILDTOP)/include/krb5/autoconf.h \
+$(OUTPRE)test_getpw.$(OBJEXT): test_getpw.c $(BUILDTOP)/include/autoconf.h \
$(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h
diff --git a/src/tests/misc/test_getpw.c b/src/tests/misc/test_getpw.c
index cd5def6a9c..6d0fb1845a 100644
--- a/src/tests/misc/test_getpw.c
+++ b/src/tests/misc/test_getpw.c
@@ -1,4 +1,4 @@
-#include "krb5/autoconf.h"
+#include "autoconf.h"
#include "k5-platform.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/tests/misc/test_getsockname.c b/src/tests/misc/test_getsockname.c
index 90bf68dfd9..7c85e74761 100644
--- a/src/tests/misc/test_getsockname.c
+++ b/src/tests/misc/test_getsockname.c
@@ -17,7 +17,7 @@
#include <netdb.h>
#include <stdio.h>
#include <string.h>
-#include "krb5/autoconf.h"
+#include "autoconf.h"
int
main(argc, argv)
diff --git a/src/tests/resolve/Makefile.in b/src/tests/resolve/Makefile.in
index a08706989d..94c85d7f82 100644
--- a/src/tests/resolve/Makefile.in
+++ b/src/tests/resolve/Makefile.in
@@ -40,5 +40,5 @@ $(OUTPRE)resolve.$(OBJEXT): resolve.c
$(OUTPRE)addrinfo-test.$(OBJEXT): addrinfo-test.c
$(OUTPRE)fake-addrinfo-test.$(OBJEXT): fake-addrinfo-test.c \
addrinfo-test.c $(SRCTOP)/include/fake-addrinfo.h $(SRCTOP)/include/port-sockets.h \
- $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/socket-utils.h \
+ $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/socket-utils.h \
$(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h
diff --git a/src/tests/shlib/ChangeLog b/src/tests/shlib/ChangeLog
index bfea7ca78b..de8142fde8 100644
--- a/src/tests/shlib/ChangeLog
+++ b/src/tests/shlib/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-11 Ken Raeburn <raeburn@mit.edu>
+
+ * t_loader.c: Don't get autoconf.h from krb5/.
+
2005-06-20 Ken Raeburn <raeburn@mit.edu>
* Makefile.in (t_loader): Use DL_LIB instead of -ldl.
diff --git a/src/tests/shlib/Makefile.in b/src/tests/shlib/Makefile.in
index 49cf20fa23..196e7a349d 100644
--- a/src/tests/shlib/Makefile.in
+++ b/src/tests/shlib/Makefile.in
@@ -35,5 +35,5 @@ clean::
# Makefile dependencies follow. This must be the last section in
# the Makefile.in file
#
-$(OUTPRE)t_loader.$(OBJEXT): t_loader.c $(BUILDTOP)/include/krb5/autoconf.h \
+$(OUTPRE)t_loader.$(OBJEXT): t_loader.c $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/gssapi/gssapi.h
diff --git a/src/tests/shlib/t_loader.c b/src/tests/shlib/t_loader.c
index ecd6a4e830..70cd6d13b8 100644
--- a/src/tests/shlib/t_loader.c
+++ b/src/tests/shlib/t_loader.c
@@ -2,7 +2,7 @@
#include <stdio.h>
#include <string.h>
#include <assert.h>
-#include "krb5/autoconf.h"
+#include "autoconf.h"
#include "krb5.h"
#include "gssapi/gssapi.h"
#define HAVE_DLOPEN 1
diff --git a/src/tests/verify/Makefile.in b/src/tests/verify/Makefile.in
index c1f6350d5b..59a922a090 100644
--- a/src/tests/verify/Makefile.in
+++ b/src/tests/verify/Makefile.in
@@ -24,9 +24,9 @@ clean::
# the Makefile.in file
#
$(OUTPRE)kdb5_verify.$(OBJEXT): kdb5_verify.c $(SRCTOP)/include/k5-int.h \
- $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
+ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \
$(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \
$(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \
+ $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \
$(SRCTOP)/include/k5-plugin.h $(SS_DEPS)