diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2006-03-11 22:23:28 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2006-03-11 22:23:28 +0000 |
| commit | cee79e98488ba138d1ebadb7488df7da54be627b (patch) | |
| tree | fd329cef103b8a0f5bddccc360f15cb6ca8c9d41 /src/tests/misc | |
| parent | 6b3217ad6ab98d4365f32d45948717e212684678 (diff) | |
| download | krb5-cee79e98488ba138d1ebadb7488df7da54be627b.tar.gz krb5-cee79e98488ba138d1ebadb7488df7da54be627b.tar.xz krb5-cee79e98488ba138d1ebadb7488df7da54be627b.zip | |
Instead of arbitrary division of headers into include and include/krb5, with
include directives sometimes using krb5/foo.h and sometimes using foo.h, and
-I options always given for both directories in both source and build trees,
push include/krb5/* up a level and drop the krb5 directory (except, for the
moment, the change log).
Updated #include directives, -I options, and dependencies accordingly, and
deleted one or two bits of old, unused code that was noticed in the process.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17730 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/tests/misc')
| -rw-r--r-- | src/tests/misc/ChangeLog | 7 | ||||
| -rw-r--r-- | src/tests/misc/Makefile.in | 3 | ||||
| -rw-r--r-- | src/tests/misc/test_getpw.c | 2 | ||||
| -rw-r--r-- | src/tests/misc/test_getsockname.c | 2 |
4 files changed, 10 insertions, 4 deletions
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) |