diff options
| author | Theodore Tso <tytso@mit.edu> | 1998-02-12 16:23:00 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1998-02-12 16:23:00 +0000 |
| commit | 981d6f23077665b3b99c2ce9c1cb0cc78003eec5 (patch) | |
| tree | 9146dc74467695281c425b65347744cfffa65a92 /src/lib | |
| parent | 98951dafa71eb4fe42c3ffa4766a0e5db9f657cf (diff) | |
Mass makefile/configure.in build system revamp
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10424 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
96 files changed, 430 insertions, 125 deletions
diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog index 27f5acf3c..5eb39457d 100644 --- a/src/lib/ChangeLog +++ b/src/lib/ChangeLog @@ -1,3 +1,10 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Use AC_CONFIG_DIRS instead of CONFIG_DIRS, and + remove use of DO_SUBDIRS. + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Wed Nov 19 10:33:19 1997 Ezra Peisach <epeisach@mit.edu> * Makefile.in (clean-unix): Do not remove libraries here as the diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 9b0fe776a..35b5b4048 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOSBUILDTOP = .. diff --git a/src/lib/configure.in b/src/lib/configure.in index 80c359eb3..3b36dd1cf 100644 --- a/src/lib/configure.in +++ b/src/lib/configure.in @@ -7,8 +7,7 @@ else AC_MSG_RESULT(skipping Kerberos 4 libraries) krb4= fi -CONFIG_DIRS(crypto krb5 des425 $krb4 krb5util kdb gssapi rpc kadm5) +AC_CONFIG_SUBDIRS(crypto krb5 des425 $krb4 krb5util kdb gssapi rpc kadm5) AC_PROG_ARCHIVE AC_PROG_RANLIB -DO_SUBDIRS V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index efeba0dbe..ebc03cb36 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -1,3 +1,10 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Use AC_CONFIG_DIRS instead of CONFIG_DIRS, and + remove use of DO_SUBDIRS. + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Oct 14 15:34:44 1997 Tom Yu <tlyu@voltage-multiplier.mit.edu> * Makefile.in: Bump major version due to possible size changes. diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in index 0cab7cd5c..3e1eaba8c 100644 --- a/src/lib/crypto/Makefile.in +++ b/src/lib/crypto/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/crc32 -I$(srcdir)/des -I$(srcdir)/md4 -I$(srcdir)/md5 -I$(srcdir)/sha ##DOSBUILDTOP = ..\.. diff --git a/src/lib/crypto/configure.in b/src/lib/crypto/configure.in index 04d628e18..ba9300cd9 100644 --- a/src/lib/crypto/configure.in +++ b/src/lib/crypto/configure.in @@ -1,6 +1,6 @@ AC_INIT(configure.in) CONFIG_RULES -CONFIG_DIRS(des crc32 md4 md5 sha os) +AC_CONFIG_SUBDIRS(des crc32 md4 md5 sha os) AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD AC_PROG_RANLIB @@ -119,7 +119,6 @@ dnl else dnl AC_MSG_RESULT(Disabling NIST_SHA) dnl fi -DO_SUBDIRS KRB5_BUILD_LIBOBJS KRB5_BUILD_LIBRARY V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/crypto/crc32/ChangeLog b/src/lib/crypto/crc32/ChangeLog index c903fdd9e..55707c380 100644 --- a/src/lib/crypto/crc32/ChangeLog +++ b/src/lib/crypto/crc32/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Sat Feb 22 18:46:38 1997 Richard Basch <basch@lehman.com> * Makefile.in: Move list file construction to win-post.in diff --git a/src/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in index 81bf5d8d5..02379bee5 100644 --- a/src/lib/crypto/crc32/Makefile.in +++ b/src/lib/crypto/crc32/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog index 2e816ff6f..848b01264 100644 --- a/src/lib/crypto/des/ChangeLog +++ b/src/lib/crypto/des/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Dec 25 20:57:53 1997 Tom Yu <chaoself@mit.edu> * init_rkey.c (mit_des_init_random_key): Punt the struct; use diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in index 37bc204ed..3c7df6460 100644 --- a/src/lib/crypto/des/Makefile.in +++ b/src/lib/crypto/des/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog index bcac6ed4b..8ee89d5c5 100644 --- a/src/lib/crypto/md4/ChangeLog +++ b/src/lib/crypto/md4/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Oct 28 16:36:15 1997 Tom Yu <tlyu@voltage-multiplier.mit.edu> * md4.c: Fix to deal with types longer than 32 bits. diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in index fa92b4ccd..9c6cb96ac 100644 --- a/src/lib/crypto/md4/Makefile.in +++ b/src/lib/crypto/md4/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) # -I$(srcdir) is needed to pull in $(srcdir)/rsa-md4.h for ./t_mddriver.c. CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des -I"$(srcdir)" diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog index 130adc451..8955638a2 100644 --- a/src/lib/crypto/md5/ChangeLog +++ b/src/lib/crypto/md5/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Oct 28 16:36:30 1997 Tom Yu <tlyu@voltage-multiplier.mit.edu> * md5.c: Fix to deal with types longer than 32 bits. diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in index 03cc6ff96..267f3ca73 100644 --- a/src/lib/crypto/md5/Makefile.in +++ b/src/lib/crypto/md5/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/crypto/os/ChangeLog b/src/lib/crypto/os/ChangeLog index dcdb92300..94d840ae1 100644 --- a/src/lib/crypto/os/ChangeLog +++ b/src/lib/crypto/os/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Fri Nov 28 21:23:42 1997 Tom Yu <tlyu@mit.edu> * configure.in: Add AC_PROG_LN_S to deal with symlinking in diff --git a/src/lib/crypto/os/Makefile.in b/src/lib/crypto/os/Makefile.in index 2ccc99bc1..39da75a86 100644 --- a/src/lib/crypto/os/Makefile.in +++ b/src/lib/crypto/os/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/crypto/sha/ChangeLog b/src/lib/crypto/sha/ChangeLog index 154f7b679..d80dbcc9d 100644 --- a/src/lib/crypto/sha/ChangeLog +++ b/src/lib/crypto/sha/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Oct 28 16:37:18 1997 Tom Yu <tlyu@voltage-multiplier.mit.edu> * shs.c, sha_glue.c, hmac_sha.c: Fix to deal with LONG wider than diff --git a/src/lib/crypto/sha/Makefile.in b/src/lib/crypto/sha/Makefile.in index 20f2ac906..72276f9e2 100644 --- a/src/lib/crypto/sha/Makefile.in +++ b/src/lib/crypto/sha/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog index 3951f45bf..ed2228606 100644 --- a/src/lib/des425/ChangeLog +++ b/src/lib/des425/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Fri Jan 23 22:19:39 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> * configure.in: Add AC_PROG_INSTALL since it's need by the install diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in index 64f3a4da4..55e5aeca5 100644 --- a/src/lib/des425/Makefile.in +++ b/src/lib/des425/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../crypto/des -I$(srcdir)/../../include/kerberosIV ##DOS##BUILDTOP = ..\.. diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog index 1aad2af77..de21f3867 100644 --- a/src/lib/gssapi/ChangeLog +++ b/src/lib/gssapi/ChangeLog @@ -1,3 +1,11 @@ +Mon Feb 2 16:47:05 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + + * configure.in: Create the makefiles for all of the subdirectories + and move all of the configure.in tests from the + subdirectories into this configure.in. + Wed Jan 21 19:12:42 1998 Tom Yu <tlyu@mit.edu> * Makefile.in (LIBMINOR): Bump minor version due to internal diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in index c4e311083..92129e0b7 100644 --- a/src/lib/gssapi/Makefile.in +++ b/src/lib/gssapi/Makefile.in @@ -1,4 +1,7 @@ -##DOSBUILDTOP = ..\.. +thisconfigdir=./ +BUILDTOP=$(U)$(U) +LOCAL_SUBDIRS= generic krb5 + ##DOSLIBNAME=gssapi.lib ##DOSOBJFILELIST=@generic.lst @krb5.lst ##DOSOBJFILEDEP=generic.lst krb5.lst diff --git a/src/lib/gssapi/configure.in b/src/lib/gssapi/configure.in index c0fba38b5..2de487194 100644 --- a/src/lib/gssapi/configure.in +++ b/src/lib/gssapi/configure.in @@ -1,11 +1,20 @@ AC_INIT(configure.in) CONFIG_RULES -CONFIG_DIRS(generic krb5) -dnl CONFIG_DIRS(generic krb5 mechglue) +dnl AC_CONFIG_SUBDIRS(generic krb5) +dnl AC_CONFIG_SUBDIRS(generic krb5 mechglue) AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD -AC_PROG_RANLIB +AC_PROG_AWK AC_PROG_INSTALL -DO_SUBDIRS +AC_PROG_RANLIB +AC_CHECK_HEADERS(stdlib.h sys/types.h limits.h) +AC_SIZE_T +AC_CHECK_SIZEOF(short) +AC_CHECK_SIZEOF(int) +AC_CHECK_SIZEOF(long) +KRB5_BUILD_LIBOBJS KRB5_BUILD_LIBRARY_WITH_DEPS -V5_AC_OUTPUT_MAKEFILE +K5_GEN_MAKEFILE(., lib) +K5_GEN_MAKEFILE(generic, libobj) +K5_GEN_MAKEFILE(krb5, libobj) +K5_OUTPUT_FILES diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog index 3e9021a04..14842021b 100644 --- a/src/lib/gssapi/generic/ChangeLog +++ b/src/lib/gssapi/generic/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Fri Jun 27 08:44:54 1997 Theodore Ts'o <tytso@rsts-11.mit.edu> * gssapi.hin: Add definition of GSS_C_NO_NAME (per diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in index dbe0f8b67..feb41ff66 100644 --- a/src/lib/gssapi/generic/Makefile.in +++ b/src/lib/gssapi/generic/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/gssapi/generic/configure.in b/src/lib/gssapi/generic/configure.in deleted file mode 100644 index f879d41f0..000000000 --- a/src/lib/gssapi/generic/configure.in +++ /dev/null @@ -1,11 +0,0 @@ -AC_INIT(configure.in) -CONFIG_RULES -AC_PROG_INSTALL -AC_PROG_AWK -AC_CHECK_HEADERS(stdlib.h sys/types.h limits.h) -AC_SIZE_T -AC_CHECK_SIZEOF(short) -AC_CHECK_SIZEOF(int) -AC_CHECK_SIZEOF(long) -KRB5_BUILD_LIBOBJS -V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index 1626ec2cf..899ac007a 100644 --- a/src/lib/gssapi/krb5/ChangeLog +++ b/src/lib/gssapi/krb5/ChangeLog @@ -1,3 +1,12 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + +Wed Jan 28 16:57:05 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in, Makefile.in: Remove use of CopySrcHeader from + configure.in and move functionality to Makefile.in + Thu Feb 5 22:39:44 1998 Theodore Y. Ts'o <tytso@mit.edu> * wrap_size_limit.c (krb5_gss_wrap_size_limit): Fix bug where if diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in index 2a16c7e4d..083529a55 100644 --- a/src/lib/gssapi/krb5/Makefile.in +++ b/src/lib/gssapi/krb5/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic ##DOS##BUILDTOP = ..\..\.. @@ -159,6 +161,18 @@ all-windows:: win-include $(SRCS) $(HDRS) all-unix:: $(SRCS) $(HDRS) includes all-unix:: all-libobjs +includes:: gssapi_krb5.h + if cmp $(srcdir)/gssapi_krb5.h \ + $(BUILDTOP)/include/gssapi/gssapi_krb5.h >/dev/null 2>&1; then :; \ + else \ + (set -x; $(RM) $(BUILDTOP)/include/gssapi/gssapi_krb5.h; \ + $(CP) $(srcdir)/gssapi_krb5.h \ + $(BUILDTOP)/include/gssapi/gssapi_krb5.h) ; \ + fi + +clean-unix:: + $(RM) $(BUILDTOP)/include/gssapi/gssapi_krb5.h + win-include:: if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR) copy gssapi_krb5.h $(EHDRDIR) diff --git a/src/lib/gssapi/krb5/configure.in b/src/lib/gssapi/krb5/configure.in deleted file mode 100644 index 8de9aa66f..000000000 --- a/src/lib/gssapi/krb5/configure.in +++ /dev/null @@ -1,8 +0,0 @@ -AC_INIT(configure.in) -CONFIG_RULES -AC_PROG_AWK -AC_PROG_INSTALL -AC_CHECK_HEADERS(stdlib.h) -KRB5_BUILD_LIBOBJS -CopySrcHeader(gssapi_krb5.h,[$](BUILDTOP)/include/gssapi) -V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/gssapi/mechglue/ChangeLog b/src/lib/gssapi/mechglue/ChangeLog index 35c48afca..b0f08da62 100644 --- a/src/lib/gssapi/mechglue/ChangeLog +++ b/src/lib/gssapi/mechglue/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Wed Feb 5 10:37:00 1996 Richard Basch <basch@lehman.com> * g_accept_sec_context.c g_acquire_cred.c g_compare_name.c diff --git a/src/lib/gssapi/mechglue/Makefile.in b/src/lib/gssapi/mechglue/Makefile.in index ae86a4fa7..33faf8910 100644 --- a/src/lib/gssapi/mechglue/Makefile.in +++ b/src/lib/gssapi/mechglue/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) ##DOSBUILDTOP = ..\..\.. diff --git a/src/lib/gssapi/mechglue/configure.in b/src/lib/gssapi/mechglue/configure.in deleted file mode 100644 index bd9b4db21..000000000 --- a/src/lib/gssapi/mechglue/configure.in +++ /dev/null @@ -1,26 +0,0 @@ -AC_INIT(configure.in) -CONFIG_RULES -AC_PROG_ARCHIVE -AC_PROG_ARCHIVE_ADD -AC_PROG_RANLIB -AC_PROG_INSTALL -AC_CHECK_HEADERS(stdlib.h) -V5_SHARED_LIB_OBJS -SubdirLibraryRule([${OBJS}]) -CopySrcHeader(mechglue.h,[$(EHDRDIR)]) -AC_CANONICAL_HOST -case $host in - *-*-aix*) # don't build libgssapi.a on AIX - ;; - *) - V5_MAKE_SHARED_LIB(libgssapi,1.0,.., ./mechglue) - AppendRule([install:: libgssapi.[$](LIBEXT) - [$](INSTALL_DATA) libgssapi.[$](LIBEXT) [$](DESTDIR)[$](KRB5_LIBDIR)[$](S)libgssapi.[$](LIBEXT)]) - LinkFileDir([$](TOPLIBD)/libgssapi.[$](LIBEXT),libgssapi.[$](LIBEXT),./gssapi/mechglue) - AppendRule([all:: [$](TOPLIBD)/libgssapi.[$](LIBEXT)]) - - ;; -esac - -V5_AC_OUTPUT_MAKEFILE - diff --git a/src/lib/kadm/ChangeLog b/src/lib/kadm/ChangeLog index 7f3afaed1..fc26f0400 100644 --- a/src/lib/kadm/ChangeLog +++ b/src/lib/kadm/ChangeLog @@ -1,3 +1,11 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + +Wed Jan 28 16:12:42 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Remove use of AppendRule and LinkFileDir + Thu Sep 25 21:30:36 1997 Tom Yu <tlyu@mit.edu> * adm_conn.c (kadm_contact_server): Replace KRB5_USE_INET with diff --git a/src/lib/kadm/Makefile.in b/src/lib/kadm/Makefile.in index 06fcb28d8..d12c9ee7f 100644 --- a/src/lib/kadm/Makefile.in +++ b/src/lib/kadm/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\.. @@ -36,9 +38,12 @@ SRCS= $(srcdir)/adm_conn.c \ # $(srcdir)/adm_kw_dec.c \ # $(srcdir)/adm_kw_enc.c +../libkadm.a: libkadm.a + $(RM) $@ + $(LN) ./kadm/$? $@ all-unix:: $(BASE_OBJS) $(DB_OBJS) $(UNIX_OBJS) -all-unix:: libkadm.a +all-unix:: libkadm.a ../libkadm.a all-mac:: $(BASE_OBJS) $(DB_OBJS) ##DOS##LIBOBJS = $(BASE_OBJS) diff --git a/src/lib/kadm/configure.in b/src/lib/kadm/configure.in index a3d4ab55e..7dabe8aaf 100644 --- a/src/lib/kadm/configure.in +++ b/src/lib/kadm/configure.in @@ -10,7 +10,4 @@ AC_HAVE_FUNCS(srand48 srand srandom syslog openlog closelog) AC_FUNC_CHECK(vsprintf,AC_DEFINE(HAVE_VSPRINTF)) AC_PROG_AWK KRB5_RUN_FLAGS -LinkFileDir(../libkadm.a, libkadm.a, ./kadm) -AppendRule([all-unix:: ../libkadm.a]) -AppendRule([all:: all-$(WHAT)]) V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog index 230b9cb51..163518ad7 100644 --- a/src/lib/kadm5/ChangeLog +++ b/src/lib/kadm5/ChangeLog @@ -1,3 +1,13 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + +Wed Jan 28 16:32:36 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in, Makefile.in: Remove the CopySrcHeader and + CopyHeader macros from configure.in and substitute + equivalent functionality in Makefile.in + Tue Jan 20 23:06:36 1998 Tom Yu <tlyu@mit.edu> * alt_prof.c (kadm5_get_config_params): Add support for Cygnus chpw. diff --git a/src/lib/kadm5/Makefile.in b/src/lib/kadm5/Makefile.in index 8fbb06ed9..ed4fa2782 100644 --- a/src/lib/kadm5/Makefile.in +++ b/src/lib/kadm5/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOSBUILDTOP = ..\.. @@ -60,6 +62,30 @@ HDRS = $(HDRDIR)/adb.h \ $(HDRDIR)/chpass_util_strings.h \ $(HDRDIR)/kadm_err.h +BUILD_HDRS = adb_err.h chpass_util_strings.h kadm_err.h +SRC_HDRS = adb.h admin.h admin_internal.h admin_xdr.h kadm_rpc.h \ + server_internal.h + +includes:: $(SRC_HDRS) $(BUILD_HDRS) + mkdir -p $(HDRDIR) + for i in $(SRC_HDRS) ; do \ + if cmp $(srcdir)/$$i $(HDRDIR)/$$i >/dev/null 2>&1; then :; \ + else \ + (set -x; $(RM) $(HDRDIR)/$$i; \ + $(CP) $(srcdir)/$$i $(HDRDIR)/$$i) ; \ + fi ; \ + done + for i in $(BUILD_HDRS) ; do \ + if cmp $$i $(HDRDIR)/$$i >/dev/null 2>&1; then :; \ + else \ + (set -x; $(RM) $(HDRDIR)/$$i; \ + $(CP) $$i $(HDRDIR)/$$i) ; \ + fi ; \ + done + +clean-unix:: + $(RM) $(HDRS) + all-prerecurse:: includes all-prerecurse:: all-libobjs diff --git a/src/lib/kadm5/clnt/ChangeLog b/src/lib/kadm5/clnt/ChangeLog index e3d65e2dc..9fef2a6e7 100644 --- a/src/lib/kadm5/clnt/ChangeLog +++ b/src/lib/kadm5/clnt/ChangeLog @@ -1,3 +1,9 @@ +Wed Jan 28 16:32:36 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in, Makefile.in: Remove the CopySrcHeader macro + from configure.in and substitute equivalent + functionality in Makefile.in + Mon Oct 13 10:55:02 1997 Ezra Peisach <epeisach@mit.edu> * client_init.c (kadm5_destroy): Free handle->lhandle field, call diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in index e53d5887b..9900ddc23 100644 --- a/src/lib/kadm5/clnt/Makefile.in +++ b/src/lib/kadm5/clnt/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) -I$(BUILDTOP)/include/kadm5 LIB=kadm5clnt @@ -47,6 +49,18 @@ all-unix:: includes all-unix:: all-liblinks all-windows:: $(OBJS) +includes:: client_internal.h + if cmp $(srcdir)/client_internal.h \ + $(BUILDTOP)/include/kadm5/client_internal.h >/dev/null 2>&1; then :; \ + else \ + (set -x; $(RM) $(BUILDTOP)/include/kadm5/client_internal.h; \ + $(CP) $(srcdir)/client_internal.h \ + $(BUILDTOP)/include/kadm5/client_internal.h) ; \ + fi + +clean-unix:: + $(RM) $(BUILDTOP)/include/kadm5/client_internal.h + check-windows:: clean-windows:: diff --git a/src/lib/kadm5/clnt/configure.in b/src/lib/kadm5/clnt/configure.in index d4e973618..7594455be 100644 --- a/src/lib/kadm5/clnt/configure.in +++ b/src/lib/kadm5/clnt/configure.in @@ -6,5 +6,4 @@ AC_PROG_RANLIB AC_PROG_INSTALL KRB5_BUILD_LIBOBJS KRB5_BUILD_LIBRARY_WITH_DEPS -CopySrcHeader(client_internal.h,[$](BUILDTOP)/include/kadm5) V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/kadm5/configure.in b/src/lib/kadm5/configure.in index f228eebc4..67fb8e759 100644 --- a/src/lib/kadm5/configure.in +++ b/src/lib/kadm5/configure.in @@ -1,7 +1,6 @@ AC_INIT(configure.in) CONFIG_RULES AC_CONFIG_SUBDIRS(clnt srv unit-test) -DO_SUBDIRS AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD AC_PROG_RANLIB @@ -10,16 +9,5 @@ AC_PROG_LEX AC_PROG_AWK AC_CHECK_HEADERS(syslog.h) AC_CHECK_FUNCS(openlog syslog closelog strftime vsprintf) -CopySrcHeader(adb.h,[$](BUILDTOP)/include/kadm5) -CopySrcHeader(admin.h,[$](BUILDTOP)/include/kadm5) -CopySrcHeader(admin_internal.h,[$](BUILDTOP)/include/kadm5) -CopySrcHeader(admin_xdr.h,[$](BUILDTOP)/include/kadm5) -dnl CopySrcHeader(client_internal.h,[$](BUILDTOP)/include/kadm5) -CopySrcHeader(kadm_rpc.h,[$](BUILDTOP)/include/kadm5) -dnl CopySrcHeader(server_acl.h,[$](BUILDTOP)/include/kadm5) -CopySrcHeader(server_internal.h,[$](BUILDTOP)/include/kadm5) -CopyHeader(adb_err.h,[$](BUILDTOP)/include/kadm5) -CopyHeader(chpass_util_strings.h,[$](BUILDTOP)/include/kadm5) -CopyHeader(kadm_err.h,[$](BUILDTOP)/include/kadm5) KRB5_BUILD_LIBOBJS V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog index afd953d5a..4fb1c9f95 100644 --- a/src/lib/kadm5/srv/ChangeLog +++ b/src/lib/kadm5/srv/ChangeLog @@ -1,3 +1,9 @@ +Wed Jan 28 16:32:36 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in, Makefile.in: Remove the CopySrcHeader macro + from configure.in and substitute equivalent + functionality in Makefile.in + Mon Oct 13 10:59:22 1997 Ezra Peisach <epeisach@mit.edu> * server_init.c (kadm5_destroy): Call kadm5_free_config_params. diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in index cf53feff6..1b04cd4a0 100644 --- a/src/lib/kadm5/srv/Makefile.in +++ b/src/lib/kadm5/srv/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) -I$(BUILDTOP)/include/kadm5 @HESIOD_DEFS@ ##DOSBUILDTOP = ..\..\.. @@ -67,6 +69,18 @@ all-unix:: includes all-unix:: all-liblinks all-windows:: $(OBJS) +includes:: server_acl.h + if cmp $(srcdir)/server_acl.h \ + $(BUILDTOP)/include/kadm5/server_acl.h >/dev/null 2>&1; then :; \ + else \ + (set -x; $(RM) $(BUILDTOP)/include/kadm5/server_acl.h; \ + $(CP) $(srcdir)/server_acl.h \ + $(BUILDTOP)/include/kadm5/server_acl.h) ; \ + fi + +clean-unix:: + $(RM) $(BUILDTOP)/include/kadm5/server_acl.h + check-windows:: clean-mac:: diff --git a/src/lib/kadm5/srv/configure.in b/src/lib/kadm5/srv/configure.in index b0c69ddf5..6730797a8 100644 --- a/src/lib/kadm5/srv/configure.in +++ b/src/lib/kadm5/srv/configure.in @@ -28,6 +28,4 @@ esac KRB5_BUILD_LIBOBJS KRB5_BUILD_LIBRARY_WITH_DEPS - -CopySrcHeader(server_acl.h,[$](BUILDTOP)/include/kadm5) V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/kadm5/unit-test/ChangeLog b/src/lib/kadm5/unit-test/ChangeLog index 3f9b54e26..659b2bcdd 100644 --- a/src/lib/kadm5/unit-test/ChangeLog +++ b/src/lib/kadm5/unit-test/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Wed Nov 19 10:55:20 1997 Ezra Peisach <epeisach@mit.edu> * Makefile.in (clean): Remove server-setkey-test diff --git a/src/lib/kadm5/unit-test/Makefile.in b/src/lib/kadm5/unit-test/Makefile.in index 96289f896..903013948 100644 --- a/src/lib/kadm5/unit-test/Makefile.in +++ b/src/lib/kadm5/unit-test/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -DUSE_KADM5_API_VERSION=1 PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog index 4923b70bf..bea687a75 100644 --- a/src/lib/kdb/ChangeLog +++ b/src/lib/kdb/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Oct 28 10:18:10 1997 Ezra Peisach <epeisach@mit.edu> * kdb_cpw.c (add_key_pwd): For KRB5_KDB_SALTTYPE_AFS3, the salt diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in index 370aa428e..113c319b8 100644 --- a/src/lib/kdb/Makefile.in +++ b/src/lib/kdb/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) KRB5_RUN_ENV = @KRB5_RUN_ENV@ KRB5_CONFIG_SETUP = KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf ; export KRB5_CONFIG ; diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index 04a313360..878169140 100644 --- a/src/lib/krb4/ChangeLog +++ b/src/lib/krb4/ChangeLog @@ -1,3 +1,10 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + + * configure.in, Makefile.in: Remove use of CopyHeader from + configure.in and move functionality to Makefile.in + Tue Jan 6 17:11:28 1998 Tom Yu <tlyu@mit.edu> * in_tkt.c: Conditionalize use of macro do_seteuid, rather than diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in index 5a4fc7864..410cca960 100644 --- a/src/lib/krb4/Makefile.in +++ b/src/lib/krb4/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(DEFINES) DEFINES=-I$(srcdir)/../../include/kerberosIV @@ -195,6 +197,18 @@ krb_err.c: krb_err.et depend:: krb_err.h depend:: $(CODE) +includes:: krb_err.h + if cmp /krb_err.h $(EHDRDIR)/krb_err.h >/dev/null 2>&1; then :; \ + else \ + (set -x; $(RM) $(EHDRDIR)/krb_err.h; \ + $(CP) krb_err.h $(EHDRDIR)/krb_err.h) ; \ + fi + +clean-unix:: + $(RM) $(EHDRDIR)/krb_err.h + + + #install-unix:: # $(INSTALL_DATA) krb_err.h $(DESTDIR)$(KRB5_INCDIR)/kerberosIV/krb_err.h diff --git a/src/lib/krb4/configure.in b/src/lib/krb4/configure.in index 10acfeda6..b79215db9 100644 --- a/src/lib/krb4/configure.in +++ b/src/lib/krb4/configure.in @@ -41,7 +41,6 @@ fi AC_DEFINE(KRB4_USE_KEYTAB) AC_HAVE_FUNCS(strsave seteuid setreuid setresuid) AC_PROG_AWK -CopyHeader(krb_err.h,$(EHDRDIR)) KRB5_BUILD_LIBOBJS KRB5_BUILD_LIBRARY_WITH_DEPS V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog index d7a189a95..acf26ac4c 100644 --- a/src/lib/krb5/ChangeLog +++ b/src/lib/krb5/ChangeLog @@ -1,3 +1,10 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Use AC_CONFIG_DIRS instead of CONFIG_DIRS, and + remove use of DO_SUBDIRS. + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Fri Jul 25 15:24:41 1997 Tom Yu <tlyu@mit.edu> * Makefile.in: Bump version due to et changes. diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in index aecf5b8ae..fa6761a26 100644 --- a/src/lib/krb5/Makefile.in +++ b/src/lib/krb5/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) ##DOSBUILDTOP = ..\.. ##DOSLIBNAME=krb5.lib ##DOSOBJFILEDEP=asn1.lst ccache.lst err_tbls.lst free.lst keytab.lst krb.lst os.lst posix.lst rcache.lst diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog index f018642ac..63c9715fb 100644 --- a/src/lib/krb5/asn.1/ChangeLog +++ b/src/lib/krb5/asn.1/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Fri Jan 2 21:18:30 1998 Tom Yu <tlyu@mit.edu> * asn1buf.c (asn12krb5_buf): Check return value of diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in index 7c06c62c4..a03e0372c 100644 --- a/src/lib/krb5/asn.1/Makefile.in +++ b/src/lib/krb5/asn.1/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS=$(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog index 0ca88f34f..226323f27 100644 --- a/src/lib/krb5/ccache/ChangeLog +++ b/src/lib/krb5/ccache/ChangeLog @@ -1,3 +1,11 @@ +Wed Feb 11 22:56:49 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + + * configure.in: Create the makefiles for all of the subdirectories + and move all of the configure.in tests from the + subdirectories into this configure.in. + Sat Dec 6 02:26:16 1997 Tom Yu <tlyu@mit.edu> * Makefile.in: Add cccopy.c. diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in index d8824ebfb..18cbc53b9 100644 --- a/src/lib/krb5/ccache/Makefile.in +++ b/src/lib/krb5/ccache/Makefile.in @@ -1,3 +1,7 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) +LOCAL_SUBDIRS = stdio file memory + CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)$(S)file -I$(srcdir)$(S)stdio ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/krb5/ccache/configure.in b/src/lib/krb5/ccache/configure.in index f38d5062f..2807b7400 100644 --- a/src/lib/krb5/ccache/configure.in +++ b/src/lib/krb5/ccache/configure.in @@ -1,6 +1,10 @@ -AC_INIT(configure.in) +AC_INIT(ccbase.c) CONFIG_RULES -CONFIG_DIRS(stdio file memory) -DO_SUBDIRS +AC_HAVE_HEADERS(unistd.h) +AC_HAVE_FUNCS(flock fchmod chmod) KRB5_BUILD_LIBOBJS -V5_AC_OUTPUT_MAKEFILE +K5_GEN_MAKEFILE(., libobj) +K5_GEN_MAKEFILE(stdio, libobj) +K5_GEN_MAKEFILE(file, libobj) +K5_GEN_MAKEFILE(memory, libobj) +K5_OUTPUT_FILES diff --git a/src/lib/krb5/ccache/file/ChangeLog b/src/lib/krb5/ccache/file/ChangeLog index 7d8b7ce15..105579e6d 100644 --- a/src/lib/krb5/ccache/file/ChangeLog +++ b/src/lib/krb5/ccache/file/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Sep 25 21:23:11 1997 Tom Yu <tlyu@mit.edu> * fcc_maybe.c: Replace KRB5_USE_INET with something more sane. diff --git a/src/lib/krb5/ccache/file/Makefile.in b/src/lib/krb5/ccache/file/Makefile.in index 3def8f1ec..86be7027f 100644 --- a/src/lib/krb5/ccache/file/Makefile.in +++ b/src/lib/krb5/ccache/file/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\..\.. diff --git a/src/lib/krb5/ccache/file/configure.in b/src/lib/krb5/ccache/file/configure.in deleted file mode 100644 index bbd406da6..000000000 --- a/src/lib/krb5/ccache/file/configure.in +++ /dev/null @@ -1,7 +0,0 @@ -AC_INIT(configure.in) -CONFIG_RULES -AC_HAVE_HEADERS(unistd.h) -AC_FUNC_CHECK(flock,AC_DEFINE(HAVE_FLOCK)) -AC_HAVE_FUNCS(fchmod chmod) -KRB5_BUILD_LIBOBJS -V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/ccache/memory/ChangeLog b/src/lib/krb5/ccache/memory/ChangeLog index 064474728..523983a02 100644 --- a/src/lib/krb5/ccache/memory/ChangeLog +++ b/src/lib/krb5/ccache/memory/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Mon Sep 15 15:15:33 1997 Ezra Peisach <epeisach@mit.edu> * mcc-proto.h, mcc_reslv.c (krb5_mcc_resolve): Incoming name diff --git a/src/lib/krb5/ccache/memory/Makefile.in b/src/lib/krb5/ccache/memory/Makefile.in index 41694a02a..7f5bea619 100644 --- a/src/lib/krb5/ccache/memory/Makefile.in +++ b/src/lib/krb5/ccache/memory/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOSBUILDTOP = ..\..\..\.. diff --git a/src/lib/krb5/ccache/memory/configure.in b/src/lib/krb5/ccache/memory/configure.in deleted file mode 100644 index 106deb0dd..000000000 --- a/src/lib/krb5/ccache/memory/configure.in +++ /dev/null @@ -1,4 +0,0 @@ -AC_INIT(configure.in) -CONFIG_RULES -KRB5_BUILD_LIBOBJS -V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/ccache/stdio/ChangeLog b/src/lib/krb5/ccache/stdio/ChangeLog index f8351fb8d..13739ebfb 100644 --- a/src/lib/krb5/ccache/stdio/ChangeLog +++ b/src/lib/krb5/ccache/stdio/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Wed Oct 29 15:57:31 1997 Theodore Y. Ts'o <tytso@mit.edu> * scc_maybe.c: Added kludge for the Macintosh, since fopen() diff --git a/src/lib/krb5/ccache/stdio/Makefile.in b/src/lib/krb5/ccache/stdio/Makefile.in index 7ae76451e..d2eeab859 100644 --- a/src/lib/krb5/ccache/stdio/Makefile.in +++ b/src/lib/krb5/ccache/stdio/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) STLIBOBJS = \ diff --git a/src/lib/krb5/ccache/stdio/configure.in b/src/lib/krb5/ccache/stdio/configure.in deleted file mode 100644 index 106deb0dd..000000000 --- a/src/lib/krb5/ccache/stdio/configure.in +++ /dev/null @@ -1,4 +0,0 @@ -AC_INIT(configure.in) -CONFIG_RULES -KRB5_BUILD_LIBOBJS -V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in index eeb2b8a0f..245746fa8 100644 --- a/src/lib/krb5/configure.in +++ b/src/lib/krb5/configure.in @@ -1,8 +1,7 @@ AC_INIT(configure.in) CONFIG_RULES -CONFIG_DIRS(error_tables asn.1 ccache keytab krb rcache free os posix) +AC_CONFIG_SUBDIRS(error_tables asn.1 ccache keytab krb rcache free os posix) AC_PROG_INSTALL -DO_SUBDIRS dnl USE_ANAME ANAME_DBDEP="$kaname_dbdep" diff --git a/src/lib/krb5/error_tables/ChangeLog b/src/lib/krb5/error_tables/ChangeLog index a3d187665..6fd14ef79 100644 --- a/src/lib/krb5/error_tables/ChangeLog +++ b/src/lib/krb5/error_tables/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Feb 5 22:58:09 1998 Theodore Y. Ts'o <tytso@mit.edu> * krb5_err.et: Add a comment about the low 128 error codes being diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in index c17991fa9..9a5096741 100644 --- a/src/lib/krb5/error_tables/Makefile.in +++ b/src/lib/krb5/error_tables/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/krb5/free/ChangeLog b/src/lib/krb5/free/ChangeLog index ec0dcb41c..6c7daec5d 100644 --- a/src/lib/krb5/free/ChangeLog +++ b/src/lib/krb5/free/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Sat Feb 22 22:26:56 1997 Richard Basch <basch@lehman.com> * Makefile.in: Use some of the new library list build rules in diff --git a/src/lib/krb5/free/Makefile.in b/src/lib/krb5/free/Makefile.in index 3f0eb099a..7aa0bec02 100644 --- a/src/lib/krb5/free/Makefile.in +++ b/src/lib/krb5/free/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog index d5b1a876c..4e627f3f7 100644 --- a/src/lib/krb5/keytab/ChangeLog +++ b/src/lib/krb5/keytab/ChangeLog @@ -1,3 +1,11 @@ +Mon Feb 2 16:47:05 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + + * configure.in: Create the makefiles for the file subdirectory + and move all of the configure.in tests from in the + subdirectory into this configure.in. + Thu Nov 21 11:55:16 EST 1996 Richard Basch <basch@lehman.com> * Makefile.in: win32 build diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in index 336394e88..8dda51c5e 100644 --- a/src/lib/krb5/keytab/Makefile.in +++ b/src/lib/krb5/keytab/Makefile.in @@ -1,3 +1,7 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) +LOCAL_SUBDIRS = file + CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/krb5/keytab/configure.in b/src/lib/krb5/keytab/configure.in index 88579b5b1..fbc2e544f 100644 --- a/src/lib/krb5/keytab/configure.in +++ b/src/lib/krb5/keytab/configure.in @@ -1,6 +1,7 @@ AC_INIT(configure.in) CONFIG_RULES -CONFIG_DIRS(file) -DO_SUBDIRS KRB5_BUILD_LIBOBJS -V5_AC_OUTPUT_MAKEFILE +K5_GEN_MAKEFILE(., libobj) +K5_GEN_MAKEFILE(file, libobj) +K5_OUTPUT_FILES + diff --git a/src/lib/krb5/keytab/db/ChangeLog b/src/lib/krb5/keytab/db/ChangeLog new file mode 100644 index 000000000..78d6801f0 --- /dev/null +++ b/src/lib/krb5/keytab/db/ChangeLog @@ -0,0 +1,10 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + +Mon Feb 2 17:05:10 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Remove SubDirLibrary rules (we will need to fix + this directory when we decide to build it again.) + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile diff --git a/src/lib/krb5/keytab/db/Makefile.in b/src/lib/krb5/keytab/db/Makefile.in index ded3ff546..78c4addf0 100644 --- a/src/lib/krb5/keytab/db/Makefile.in +++ b/src/lib/krb5/keytab/db/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOSBUILDTOP = ..\..\..\.. diff --git a/src/lib/krb5/keytab/db/configure.in b/src/lib/krb5/keytab/db/configure.in index 7eff1bc8b..b643c05fe 100644 --- a/src/lib/krb5/keytab/db/configure.in +++ b/src/lib/krb5/keytab/db/configure.in @@ -1,5 +1,9 @@ AC_INIT(configure.in) CONFIG_RULES -V5_SHARED_LIB_OBJS -SubdirLibraryRule([${OBJS}]) +dnl +dnl We're currently not building this directory, and the shared library +dnl calls needs to be redone if/when we include this. +dnl +dnl V5_SHARED_LIB_OBJS +dnl SubdirLibraryRule([${OBJS}]) V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog index 6e40e9bf7..edcfebcc8 100644 --- a/src/lib/krb5/keytab/file/ChangeLog +++ b/src/lib/krb5/keytab/file/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:03:20 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Oct 28 10:53:10 1997 Ezra Peisach <epeisach@kangaroo.mit.edu> * ktf_wreslv.c, ktf_resolv.c:Initialize version element of diff --git a/src/lib/krb5/keytab/file/Makefile.in b/src/lib/krb5/keytab/file/Makefile.in index a4362ba42..39e909cd2 100644 --- a/src/lib/krb5/keytab/file/Makefile.in +++ b/src/lib/krb5/keytab/file/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\..\.. diff --git a/src/lib/krb5/keytab/file/configure.in b/src/lib/krb5/keytab/file/configure.in deleted file mode 100644 index 106deb0dd..000000000 --- a/src/lib/krb5/keytab/file/configure.in +++ /dev/null @@ -1,4 +0,0 @@ -AC_INIT(configure.in) -CONFIG_RULES -KRB5_BUILD_LIBOBJS -V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 0a99bfa2b..957ba4397 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Feb 5 23:48:34 1998 Theodore Y. Ts'o <tytso@mit.edu> * rd_cred.c (krb5_rd_cred): diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in index 87f93ea19..41cc0a8b2 100644 --- a/src/lib/krb5/krb/Makefile.in +++ b/src/lib/krb5/krb/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) RUN_SETUP = @KRB5_RUN_ENV@ PROG_LIBPATH=-L$(TOPLIBD) diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog index e95b95eb3..0a0e7bb20 100644 --- a/src/lib/krb5/os/ChangeLog +++ b/src/lib/krb5/os/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:19 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Fri Jan 30 15:56:15 1998 Tom Yu <tlyu@mit.edu> * changepw.c (krb5_change_password): KRB5_USE_INET -> diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in index aeea59e76..61c6ded8b 100644 --- a/src/lib/krb5/os/Makefile.in +++ b/src/lib/krb5/os/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) KRB5_RUN_ENV = @KRB5_RUN_ENV@ PROG_LIBPATH=-L$(TOPLIBD) diff --git a/src/lib/krb5/posix/ChangeLog b/src/lib/krb5/posix/ChangeLog index c60660f16..b0f7edb47 100644 --- a/src/lib/krb5/posix/ChangeLog +++ b/src/lib/krb5/posix/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:00 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Sep 18 17:56:29 1997 Tom Yu <tlyu@mit.edu> * strcasecmp.c: Replace USE_STRING_H with something more sane. diff --git a/src/lib/krb5/posix/Makefile.in b/src/lib/krb5/posix/Makefile.in index 0859caa9d..d81d0fbd8 100644 --- a/src/lib/krb5/posix/Makefile.in +++ b/src/lib/krb5/posix/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog index 5a17d8ec4..e63a9e2c1 100644 --- a/src/lib/krb5/rcache/ChangeLog +++ b/src/lib/krb5/rcache/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:01:50 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Sep 25 21:28:41 1997 Tom Yu <tlyu@mit.edu> * rc_io.c: Replace KRB5_USE_INET with something more sane. diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in index efcf3e4fd..21170a062 100644 --- a/src/lib/krb5/rcache/Makefile.in +++ b/src/lib/krb5/rcache/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/krb5util/ChangeLog b/src/lib/krb5util/ChangeLog index 1666316bf..914f76b28 100644 --- a/src/lib/krb5util/ChangeLog +++ b/src/lib/krb5util/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:01:22 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Jan 6 16:51:44 1998 Tom Yu <tlyu@mit.edu> * seteuid.c (krb5_seteuid): Don't check for _POSIX_SAVED_IDS, as diff --git a/src/lib/krb5util/Makefile.in b/src/lib/krb5util/Makefile.in index ecab50032..26ba3150e 100644 --- a/src/lib/krb5util/Makefile.in +++ b/src/lib/krb5util/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOSBUILDTOP = ..\.. diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog index 8c200ef70..75e23af1d 100644 --- a/src/lib/rpc/ChangeLog +++ b/src/lib/rpc/ChangeLog @@ -1,3 +1,11 @@ +Mon Feb 2 17:00:16 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + + * configure.in, Makefile.in: Remove CopySrcHeader and CopyHeader + from configure.in and move equivalent functionality to + Makefile.in + Wed Jan 21 15:06:00 1998 Ezra Peisach <epeisach@mit.edu> * bindresvport.c: Include string.h for memset prototype. diff --git a/src/lib/rpc/Makefile.in b/src/lib/rpc/Makefile.in index 9a61ebd49..bf0ffff75 100644 --- a/src/lib/rpc/Makefile.in +++ b/src/lib/rpc/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) -DGSSAPI_KRB5 -DDEBUG_GSSAPI=0 ##DOSBUILDTOP = ..\.. @@ -178,6 +180,34 @@ all-windows:: $(OBJS) install-unix:: install-libs +BUILD_HDRS = types.h +SRC_HDRS = auth.h auth_gssapi.h auth_unix.h clnt.h netdb.h pmap_clnt.h \ + pmap_prot.h pmap_rmt.h rpc.h rpc_msg.h svc.h svc_auth.h \ + xdr.h + +includes:: $(SRC_HDRS) $(BUILD_HDRS) + mkdir -p $(HDRDIR) + for i in $(SRC_HDRS) ; do \ + if cmp $(srcdir)/$$i $(HDRDIR)/$$i >/dev/null 2>&1; then :; \ + else \ + (set -x; $(RM) $(HDRDIR)/$$i; \ + $(CP) $(srcdir)/$$i $(HDRDIR)/$$i) ; \ + fi ; \ + done + for i in $(BUILD_HDRS) ; do \ + if cmp $$i $(HDRDIR)/$$i >/dev/null 2>&1; then :; \ + else \ + (set -x; $(RM) $(HDRDIR)/$$i; \ + $(CP) $$i $(HDRDIR)/$$i) ; \ + fi ; \ + done + +clean-unix:: + $(RM) $(HDRS) + for i in $(SRC_HDRS) $(BUILD_HDRS) ; do \ + $(RM) $(HDRDIR)/$$i ; \ + done + check-windows:: clean-unix:: clean-liblinks clean-libs clean-libobjs diff --git a/src/lib/rpc/configure.in b/src/lib/rpc/configure.in index 87130bf74..d89148ea1 100644 --- a/src/lib/rpc/configure.in +++ b/src/lib/rpc/configure.in @@ -1,7 +1,6 @@ AC_INIT(auth_gssapi.c) CONFIG_RULES -CONFIG_DIRS(unit-test) -DO_SUBDIRS +AC_CONFIG_SUBDIRS(unit-test) AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD AC_PROG_RANLIB @@ -71,24 +70,9 @@ extern void endrpcent();], [int i;], k5_cv_type_endrpcent=void, k5_cv_type_endrpcent=int)])dnl AC_MSG_RESULT($k5_cv_type_endrpcent) AC_DEFINE_UNQUOTED(ENDRPCENT_TYPE, $k5_cv_type_endrpcent) - DECLARE_SYS_ERRLIST - -CopySrcHeader(auth.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(auth_gssapi.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(auth_unix.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(clnt.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(netdb.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(pmap_clnt.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(pmap_prot.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(pmap_rmt.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(rpc.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(rpc_msg.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(svc.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(svc_auth.h,[$](BUILDTOP)/include/rpc) -CopyHeader(types.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(xdr.h,[$](BUILDTOP)/include/rpc) - KRB5_BUILD_LIBOBJS KRB5_BUILD_LIBRARY_WITH_DEPS -V5_AC_OUTPUT_MAKEFILE( ,types.h:types.hin) +K5_GEN_MAKEFILE(., lib libobj) +K5_GEN_FILE(types.h:types.hin) +K5_OUTPUT_FILES diff --git a/src/lib/rpc/unit-test/ChangeLog b/src/lib/rpc/unit-test/ChangeLog index 62225f225..2d7a2beb2 100644 --- a/src/lib/rpc/unit-test/ChangeLog +++ b/src/lib/rpc/unit-test/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 16:59:48 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Oct 9 20:58:35 1997 Tom Yu <tlyu@mit.edu> * configure.in, Makefile.in: Add test to disable udp test under diff --git a/src/lib/rpc/unit-test/Makefile.in b/src/lib/rpc/unit-test/Makefile.in index 95cf25206..ec2ad9e6f 100644 --- a/src/lib/rpc/unit-test/Makefile.in +++ b/src/lib/rpc/unit-test/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -I. PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) |