diff options
| author | Tom Yu <tlyu@mit.edu> | 1994-06-17 07:22:12 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1994-06-17 07:22:12 +0000 |
| commit | 32c8adaeaf9639dc536a718d9fa8551ac6af9753 (patch) | |
| tree | 43f171558b1b3e3779e33b6e26603b3e0b1b560b | |
| parent | 1255123721a9ead5eda5d0628b5d2bb8c31b5dec (diff) | |
| download | krb5-32c8adaeaf9639dc536a718d9fa8551ac6af9753.zip krb5-32c8adaeaf9639dc536a718d9fa8551ac6af9753.tar.gz krb5-32c8adaeaf9639dc536a718d9fa8551ac6af9753.tar.bz2 | |
support to calculate BUILDTOP in makeaclocals
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3861 dc483132-0cff-0310-8789-dd5450dbe970
129 files changed, 155 insertions, 65 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index ecd483b..9cecae8 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/aclocal.m4 b/src/aclocal.m4 index c3816e9..fb202c1 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -26,11 +26,20 @@ define(AC__CONFIG_AUX,[ AC_PROVIDE([$0])dnl ])dnl dnl +dnl set up buildtop stuff +dnl +define(AC_BUILDTOP,[.])dnl +define(AC_SET_BUILDTOP, +[BUILDTOP=AC_BUILDTOP +AC_SUBST(BUILDTOP)dnl +])dnl +dnl +dnl dnl Does configure need to be run in immediate subdirectories of this dnl directory? dnl define(CONFIG_DIRS,[ -AC_REQUIRE([AC__CONFIG_AUX]) +AC_REQUIRE([AC__CONFIG_AUX])dnl changequote(<<<,>>>)dnl SUBDIRS="$1" if [ -z "${norecursion}" ] ; then @@ -123,8 +132,9 @@ $2::<<< @case '${MFLAGS}' in *[ik]*) set +e ;; esac; \ for i in $(SUBDIRS) ;\ do \ - (cd $$i ; echo>>> $1 <<<"in $(CURRENT_DIR)/$$i..."; \ - $(MAKE) $(MFLAGS) CURRENT_DIR=$(CURRENT_DIR)/$$i >>>$2<<<); \ + (cd $$i ; echo>>> $1 <<<"in $(CURRENT_DIR)$$i..."; \ + $(MAKE) $(MFLAGS) \ + CURRENT_DIR=$(CURRENT_DIR)$$i/ >>>$2<<<); \ done>>> divert(0)dnl changequote([,])dnl diff --git a/src/admin/Makefile.in b/src/admin/Makefile.in index e2d8676..500b5a2 100644 --- a/src/admin/Makefile.in +++ b/src/admin/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/admin/convert/configure.in b/src/admin/convert/configure.in index 14e7a1c..1324790 100644 --- a/src/admin/convert/configure.in +++ b/src/admin/convert/configure.in @@ -1,4 +1,5 @@ AC_INIT(kdb5_convert.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) CONFIG_RULES diff --git a/src/admin/create/Makefile.in b/src/admin/create/Makefile.in index 0ebe65c..53bd1db 100644 --- a/src/admin/create/Makefile.in +++ b/src/admin/create/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/admin/create/configure.in b/src/admin/create/configure.in index d2310e4..cfc2721 100644 --- a/src/admin/create/configure.in +++ b/src/admin/create/configure.in @@ -1,4 +1,5 @@ AC_INIT(kdb5_create.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) CONFIG_RULES diff --git a/src/admin/destroy/Makefile.in b/src/admin/destroy/Makefile.in index 508ff06..0cd4fc4 100644 --- a/src/admin/destroy/Makefile.in +++ b/src/admin/destroy/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/admin/destroy/configure.in b/src/admin/destroy/configure.in index 88f8fb5..3e6da12 100644 --- a/src/admin/destroy/configure.in +++ b/src/admin/destroy/configure.in @@ -1,4 +1,5 @@ AC_INIT(kdb5_destroy.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) CONFIG_RULES diff --git a/src/admin/edit/Makefile.in b/src/admin/edit/Makefile.in index 8af59ec..01496e6 100644 --- a/src/admin/edit/Makefile.in +++ b/src/admin/edit/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/admin/edit/configure.in b/src/admin/edit/configure.in index 5b80c31..954c13a 100644 --- a/src/admin/edit/configure.in +++ b/src/admin/edit/configure.in @@ -1,4 +1,5 @@ AC_INIT(kdb5_edit.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) SS_RULES diff --git a/src/admin/stash/Makefile.in b/src/admin/stash/Makefile.in index 9ac8c6d..3919411 100644 --- a/src/admin/stash/Makefile.in +++ b/src/admin/stash/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/admin/stash/configure.in b/src/admin/stash/configure.in index ee61deb..83dffc4 100644 --- a/src/admin/stash/configure.in +++ b/src/admin/stash/configure.in @@ -1,4 +1,5 @@ AC_INIT(kdb5_stash.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) CONFIG_RULES diff --git a/src/appl/Makefile.in b/src/appl/Makefile.in index 2cc2702..6fd0859 100644 --- a/src/appl/Makefile.in +++ b/src/appl/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/appl/configure.in b/src/appl/configure.in index 7846105..7cdf8fe 100644 --- a/src/appl/configure.in +++ b/src/appl/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(sample simple user_user) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) diff --git a/src/appl/sample/Makefile.in b/src/appl/sample/Makefile.in index 2cc2702..6fd0859 100644 --- a/src/appl/sample/Makefile.in +++ b/src/appl/sample/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/appl/sample/configure.in b/src/appl/sample/configure.in index 68abe78..c1c3fa2 100644 --- a/src/appl/sample/configure.in +++ b/src/appl/sample/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(sclient sserver) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in index 5b64492..d79c362 100644 --- a/src/appl/sample/sclient/Makefile.in +++ b/src/appl/sample/sclient/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/appl/sample/sclient/configure.in b/src/appl/sample/sclient/configure.in index c1db0af..40a35bf 100644 --- a/src/appl/sample/sclient/configure.in +++ b/src/appl/sample/sclient/configure.in @@ -1,4 +1,5 @@ AC_INIT(sclient.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) CONFIG_RULES diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in index 59590b6..12ab635 100644 --- a/src/appl/sample/sserver/Makefile.in +++ b/src/appl/sample/sserver/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/appl/sample/sserver/configure.in b/src/appl/sample/sserver/configure.in index 600c109..03cc40f 100644 --- a/src/appl/sample/sserver/configure.in +++ b/src/appl/sample/sserver/configure.in @@ -1,4 +1,5 @@ AC_INIT(sserver.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) CONFIG_RULES diff --git a/src/appl/simple/Makefile.in b/src/appl/simple/Makefile.in index 2cc2702..6fd0859 100644 --- a/src/appl/simple/Makefile.in +++ b/src/appl/simple/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in index a606349..58a64b0 100644 --- a/src/appl/simple/client/Makefile.in +++ b/src/appl/simple/client/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/appl/simple/client/configure.in b/src/appl/simple/client/configure.in index 2bdcf76..2b66c22 100644 --- a/src/appl/simple/client/configure.in +++ b/src/appl/simple/client/configure.in @@ -1,4 +1,5 @@ AC_INIT(sim_client.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) CONFIG_RULES diff --git a/src/appl/simple/configure.in b/src/appl/simple/configure.in index 2458e9f..26a05ce 100644 --- a/src/appl/simple/configure.in +++ b/src/appl/simple/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(client server) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in index c996df3..6d852c8 100644 --- a/src/appl/simple/server/Makefile.in +++ b/src/appl/simple/server/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/appl/simple/server/configure.in b/src/appl/simple/server/configure.in index 61ade33..d71cde8 100644 --- a/src/appl/simple/server/configure.in +++ b/src/appl/simple/server/configure.in @@ -1,4 +1,5 @@ AC_INIT(sim_server.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) CONFIG_RULES diff --git a/src/appl/telnet/Makefile.in b/src/appl/telnet/Makefile.in index efe7e89..4e3d8e0 100644 --- a/src/appl/telnet/Makefile.in +++ b/src/appl/telnet/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ TELNET_OPSYS= @TELNET@ all:: diff --git a/src/appl/telnet/configure.in b/src/appl/telnet/configure.in index d84b860..7fb5a3f 100644 --- a/src/appl/telnet/configure.in +++ b/src/appl/telnet/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(libtelnet telnet telnetd) CONFIG_RULES AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/appl/telnet/libtelnet/Makefile.in b/src/appl/telnet/libtelnet/Makefile.in index 9d05199..1f1129b 100644 --- a/src/appl/telnet/libtelnet/Makefile.in +++ b/src/appl/telnet/libtelnet/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/appl/telnet/libtelnet/configure.in b/src/appl/telnet/libtelnet/configure.in index 15e2337..da7e0b4 100644 --- a/src/appl/telnet/libtelnet/configure.in +++ b/src/appl/telnet/libtelnet/configure.in @@ -1,4 +1,5 @@ AC_INIT(auth.c) +AC_SET_BUILDTOP CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE diff --git a/src/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in index 6764c33..6cf5ce2 100644 --- a/src/appl/user_user/Makefile.in +++ b/src/appl/user_user/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) -DDEBUG LDFLAGS = -g -BUILDTOP=../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/appl/user_user/configure.in b/src/appl/user_user/configure.in index aa5084d..808ded1 100644 --- a/src/appl/user_user/configure.in +++ b/src/appl/user_user/configure.in @@ -1,4 +1,5 @@ AC_INIT(client.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) CONFIG_RULES diff --git a/src/clients/Makefile.in b/src/clients/Makefile.in index 2cc2702..6fd0859 100644 --- a/src/clients/Makefile.in +++ b/src/clients/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/clients/configure.in b/src/clients/configure.in index a66530a..cdd6320 100644 --- a/src/clients/configure.in +++ b/src/clients/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(klist kinit kdestroy) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) diff --git a/src/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in index ec8bccb..9f6eb19 100644 --- a/src/clients/kdestroy/Makefile.in +++ b/src/clients/kdestroy/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/clients/kdestroy/configure.in b/src/clients/kdestroy/configure.in index 3b43bb6..f168750 100644 --- a/src/clients/kdestroy/configure.in +++ b/src/clients/kdestroy/configure.in @@ -1,4 +1,5 @@ AC_INIT(kdestroy.c) +AC_SET_BUILDTOP CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE diff --git a/src/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in index ff9b5ed..b583384 100644 --- a/src/clients/kinit/Makefile.in +++ b/src/clients/kinit/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/clients/kinit/configure.in b/src/clients/kinit/configure.in index d380cf2..0c75146 100644 --- a/src/clients/kinit/configure.in +++ b/src/clients/kinit/configure.in @@ -1,4 +1,5 @@ AC_INIT(kinit.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) CONFIG_RULES diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in index 36d8110..dd00298 100644 --- a/src/clients/klist/Makefile.in +++ b/src/clients/klist/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/clients/klist/configure.in b/src/clients/klist/configure.in index 10d47de..c09d5e4 100644 --- a/src/clients/klist/configure.in +++ b/src/clients/klist/configure.in @@ -1,4 +1,5 @@ AC_INIT(klist.c) +AC_SET_BUILDTOP CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE diff --git a/src/configure.in b/src/configure.in index e5eac0c..d73a8e6 100644 --- a/src/configure.in +++ b/src/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(util include isode lib kdc admin kadmin slave clients appl) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) diff --git a/src/include/Makefile.in b/src/include/Makefile.in index bbccd90..7f66f33 100644 --- a/src/include/Makefile.in +++ b/src/include/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ # nothing needed here srcdir = @srcdir@ SUBDIRS = @SUBDIRS@ diff --git a/src/include/configure.in b/src/include/configure.in index 3b0a659..ecbd367 100644 --- a/src/include/configure.in +++ b/src/include/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(krb5 kerberosIV) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) diff --git a/src/include/kerberosIV/Makefile.in b/src/include/kerberosIV/Makefile.in index 81afd82..f275dce 100644 --- a/src/include/kerberosIV/Makefile.in +++ b/src/include/kerberosIV/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/include/kerberosIV/configure.in b/src/include/kerberosIV/configure.in index e216b52..648d3e0 100644 --- a/src/include/kerberosIV/configure.in +++ b/src/include/kerberosIV/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES WITH_KRB5ROOT AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in index 34c4795..6d4d20c 100644 --- a/src/include/krb5/Makefile.in +++ b/src/include/krb5/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -8,7 +9,6 @@ KRB5ROOT = @KRB5ROOT@ KDB5DIR = $(KRB5ROOT) KRB5SRVTABDIR = /etc -BUILDTOP = ../.. RM = rm -f diff --git a/src/include/krb5/configure.in b/src/include/krb5/configure.in index 6bbe220..862658c 100644 --- a/src/include/krb5/configure.in +++ b/src/include/krb5/configure.in @@ -1,4 +1,5 @@ AC_INIT(acconfig.h) +AC_SET_BUILDTOP AC_CONFIG_HEADER(autoconf.h) AC_PROG_LEX HAVE_YYLINENO diff --git a/src/isode/Makefile.in b/src/isode/Makefile.in index 47706e8..da06aeb 100644 --- a/src/isode/Makefile.in +++ b/src/isode/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/isode/compat/Makefile.in b/src/isode/compat/Makefile.in index 7241ca8..a76fd57 100644 --- a/src/isode/compat/Makefile.in +++ b/src/isode/compat/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ ############################################################################### # Instructions to Make, for compilation of UNIX compatibility library ############################################################################### @@ -5,8 +6,7 @@ srcdir = @srcdir@ VPATH = @srcdir@ -BUILDTOP = ../../ -TOPDIR = $(BUILDTOP) +TOPDIR = $(BUILDTOP)/ OPTIONS = -I. -I$(HDIR) -I$(ISODEINC) $(PEPYPATH) $(KRBOPT) CFLAGS = $(OPTIONS) $(LOPTIONS) @@ -16,7 +16,7 @@ ISODEINCM= $(KRBINC)isode ISODEINC= $(ISODEINCM)/ HDIR = $(TOPDIR)isode/h/ -UTILDIR = $(srcdir)/$(BUILDTOP)isode/util/ +UTILDIR = $(srcdir)/$(TOPDIR)isode/util/ INCDIRM = $(HDIR) INCDIR = $(INCDIRM)/ PEPSYDIRM= $(INCDIR)pepsy diff --git a/src/isode/compat/configure.in b/src/isode/compat/configure.in index 0159192..b18ba0d 100644 --- a/src/isode/compat/configure.in +++ b/src/isode/compat/configure.in @@ -1,3 +1,4 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP AC_REPLACE_FUNCS(strdup) -AC_OUTPUT(Makefile) +AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/isode/configure.in b/src/isode/configure.in index 2ef53dd..d98e897 100644 --- a/src/isode/configure.in +++ b/src/isode/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(h compat psap pepsy support) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) diff --git a/src/isode/h/Makefile.in b/src/isode/h/Makefile.in index 92e3b1b..2390c5e 100644 --- a/src/isode/h/Makefile.in +++ b/src/isode/h/Makefile.in @@ -1,11 +1,11 @@ +BUILDTOP=@BUILDTOP@ ############################################################################### # Instructions to Make, for compilation of ISODE header files ############################################################################### srcdir = @srcdir@ VPATH = @srcdir@ -BUILDTOP = ../../ -TOPDIR = $(BUILDTOP) +TOPDIR = $(BUILDTOP)/ OPTIONS = -I. -I$(HDIR) $(PEPYPATH) $(KRBOPT) CFLAGS = $(OPTIONS) $(LOPTIONS) diff --git a/src/isode/h/configure.in b/src/isode/h/configure.in index cdff2db..1ffff33 100644 --- a/src/isode/h/configure.in +++ b/src/isode/h/configure.in @@ -1,2 +1,3 @@ AC_INIT(configure.in) -AC_OUTPUT(Makefile) +AC_SET_BUILDTOP +AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/isode/pepsy/Makefile.in b/src/isode/pepsy/Makefile.in index 2f98140..0b7db0f 100644 --- a/src/isode/pepsy/Makefile.in +++ b/src/isode/pepsy/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ ############################################################################### # Instructions to Make, for compilation of ISODE PEPSY process ############################################################################### @@ -6,14 +7,13 @@ srcdir = @srcdir@ VPATH = @srcdir@ DEFS = @DEFS@ -BUILDTOP = ../../ -TOPDIR = $(BUILDTOP) +TOPDIR = $(BUILDTOP)/ OPTIONS = -I. -I$(HDIR) -I$(TOPDIR)include $(PEPYPATH) $(KRBOPT) CFLAGS = $(OPTIONS) $(LOPTIONS) $(DEFS) HDIR = $(srcdir)/$(TOPDIR)isode/h/ -UTILDIR = $(srcdir)/$(BUILDTOP)isode/util/ +UTILDIR = $(srcdir)/$(TOPDIR)isode/util/ INCDIRM = $(HDIR) INCDIR = $(INCDIRM)/ PEPSYDIRM= $(INCDIR)pepsy diff --git a/src/isode/pepsy/configure.in b/src/isode/pepsy/configure.in index 3f73b84..56a3b8c 100644 --- a/src/isode/pepsy/configure.in +++ b/src/isode/pepsy/configure.in @@ -1,5 +1,6 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP AC_PROG_LEX AC_YYTEXT_POINTER HAVE_YYLINENO -AC_OUTPUT(Makefile) +AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/isode/psap/Makefile.in b/src/isode/psap/Makefile.in index 73c4325..c13f756 100644 --- a/src/isode/psap/Makefile.in +++ b/src/isode/psap/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ ############################################################################### # Instructions to Make, for compilation of ISODE PSAP processes ############################################################################### @@ -5,8 +6,7 @@ srcdir = @srcdir@ VPATH = @srcdir@ -BUILDTOP = ../../ -TOPDIR = $(BUILDTOP) +TOPDIR = $(BUILDTOP)/ LIBDIR = $(TOPDIR)lib/ OPTIONS = -I. -I$(HDIR) -I$(ISODEINC) $(PEPYPATH) $(KRBOPT) @@ -17,7 +17,7 @@ ISODEINCM= $(KRBINC)isode ISODEINC= $(ISODEINCM)/ HDIR = $(TOPDIR)isode/h/ -UTILDIR = $(srcdir)/$(BUILDTOP)isode/util/ +UTILDIR = $(srcdir)/$(TOPDIR)isode/util/ INCDIRM = $(HDIR) INCDIR = $(INCDIRM)/ PEPSYDIRM= $(INCDIR)pepsy diff --git a/src/isode/psap/configure.in b/src/isode/psap/configure.in index c7b4a2b..191ca75 100644 --- a/src/isode/psap/configure.in +++ b/src/isode/psap/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(nsl) AC_HAVE_LIBRARY(socket) -AC_OUTPUT(Makefile) +AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/isode/support/Makefile.in b/src/isode/support/Makefile.in index 807ed16..6d6df30 100644 --- a/src/isode/support/Makefile.in +++ b/src/isode/support/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ ############################################################################### # Instructions to Make, for compilation of ISODE support processes ############################################################################### @@ -5,14 +6,13 @@ srcdir = @srcdir@ VPATH = @srcdir@ -BUILDTOP = ../../ -TOPDIR = $(BUILDTOP) +TOPDIR = $(BUILDTOP)/ OPTIONS = -I. -I$(HDIR) $(PEPYPATH) $(KRBOPT) CFLAGS = $(OPTIONS) $(LOPTIONS) HDIR = $(srcdir)/$(TOPDIR)isode/h/ -UTILDIR = $(srcdir)/$(BUILDTOP)isode/util/ +UTILDIR = $(srcdir)/$(TOPDIR)isode/util/ INCDIRM = $(HDIR) INCDIR = $(INCDIRM)/ PEPSYDIRM= $(INCDIR)pepsy diff --git a/src/isode/support/configure.in b/src/isode/support/configure.in index cdff2db..1ffff33 100644 --- a/src/isode/support/configure.in +++ b/src/isode/support/configure.in @@ -1,2 +1,3 @@ AC_INIT(configure.in) -AC_OUTPUT(Makefile) +AC_SET_BUILDTOP +AC_OUTPUT(Makefile,[EXTRA_RULES]) diff --git a/src/kadmin/Makefile.in b/src/kadmin/Makefile.in index 66b26e4..2f83054 100644 --- a/src/kadmin/Makefile.in +++ b/src/kadmin/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/kadmin/client/Makefile.in b/src/kadmin/client/Makefile.in index 3f56b59..ea43145 100644 --- a/src/kadmin/client/Makefile.in +++ b/src/kadmin/client/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/kadmin/client/configure.in b/src/kadmin/client/configure.in index 192775c..6c2ff61 100644 --- a/src/kadmin/client/configure.in +++ b/src/kadmin/client/configure.in @@ -1,4 +1,5 @@ AC_INIT(kadmin.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) ET_RULES diff --git a/src/kadmin/configure.in b/src/kadmin/configure.in index d46e2e5..5b34bf5 100644 --- a/src/kadmin/configure.in +++ b/src/kadmin/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP AC_WITH([krb4],v4server=v4server,v4server=) CONFIG_DIRS(client kpasswd server $v4server) MAKE_SUBDIRS("making",all) diff --git a/src/kadmin/kpasswd/Makefile.in b/src/kadmin/kpasswd/Makefile.in index fbaaa2a..750729a 100644 --- a/src/kadmin/kpasswd/Makefile.in +++ b/src/kadmin/kpasswd/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=../.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/kadmin/kpasswd/configure.in b/src/kadmin/kpasswd/configure.in index 169694b..078be76 100644 --- a/src/kadmin/kpasswd/configure.in +++ b/src/kadmin/kpasswd/configure.in @@ -1,4 +1,5 @@ AC_INIT(kpasswd.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) ET_RULES diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in index 0e5ddda..b426467 100644 --- a/src/kdc/Makefile.in +++ b/src/kdc/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -9,7 +10,6 @@ K4LIB = @K4LIB@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/kdc/configure.in b/src/kdc/configure.in index 1793b21..6a93b5d 100644 --- a/src/kdc/configure.in +++ b/src/kdc/configure.in @@ -1,4 +1,5 @@ AC_INIT(main.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) ET_RULES diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 50f1399..d2fbf83 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/lib/configure.in b/src/lib/configure.in index 876f490..6171722 100644 --- a/src/lib/configure.in +++ b/src/lib/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(krb5 kdb des425 krb425 crypto gssapi) AC_PROG_ARCHIVE AC_PROG_RANLIB diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in index 70026ab..fe1946e 100644 --- a/src/lib/crypto/Makefile.in +++ b/src/lib/crypto/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -16,7 +17,6 @@ RM = rm -f CP = cp RANLIB = @RANLIB@ -BUILDTOP = ../.. SRCTOP = $(srcdir)/$(BUILDTOP) OBJS= cryptoconf.o diff --git a/src/lib/crypto/configure.in b/src/lib/crypto/configure.in index dd05b0e..9f81e7c 100644 --- a/src/lib/crypto/configure.in +++ b/src/lib/crypto/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(des crc32 md4 md5 os) AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD diff --git a/src/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in index c2c88a4..7f9cf8f 100644 --- a/src/lib/crypto/crc32/Makefile.in +++ b/src/lib/crypto/crc32/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -12,7 +13,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/crypto/crc32/configure.in b/src/lib/crypto/crc32/configure.in index 184c6f4..cc5e8f0 100644 --- a/src/lib/crypto/crc32/configure.in +++ b/src/lib/crypto/crc32/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in index f8a3ffc..5ee98d9 100644 --- a/src/lib/crypto/des/Makefile.in +++ b/src/lib/crypto/des/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -12,7 +13,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/crypto/des/configure.in b/src/lib/crypto/des/configure.in index 184c6f4..cc5e8f0 100644 --- a/src/lib/crypto/des/configure.in +++ b/src/lib/crypto/des/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in index 04e56f4..0e758dd 100644 --- a/src/lib/crypto/md4/Makefile.in +++ b/src/lib/crypto/md4/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -12,7 +13,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/crypto/md4/configure.in b/src/lib/crypto/md4/configure.in index 184c6f4..cc5e8f0 100644 --- a/src/lib/crypto/md4/configure.in +++ b/src/lib/crypto/md4/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in index ff2571b..a8c5a1c 100644 --- a/src/lib/crypto/md5/Makefile.in +++ b/src/lib/crypto/md5/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -12,7 +13,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/crypto/md5/configure.in b/src/lib/crypto/md5/configure.in index 184c6f4..cc5e8f0 100644 --- a/src/lib/crypto/md5/configure.in +++ b/src/lib/crypto/md5/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/lib/crypto/os/Makefile.in b/src/lib/crypto/os/Makefile.in index 86ca11e..6468834 100644 --- a/src/lib/crypto/os/Makefile.in +++ b/src/lib/crypto/os/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -15,7 +16,6 @@ LN = @LN_S@ LIBOBJS = @LIBOBJS@ -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/crypto/os/configure.in b/src/lib/crypto/os/configure.in index f7d1801..49a6c82 100644 --- a/src/lib/crypto/os/configure.in +++ b/src/lib/crypto/os/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in index 0c43634..f9ee53c 100644 --- a/src/lib/des425/Makefile.in +++ b/src/lib/des425/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ RANLIB = @RANLIB@ ARCHIVE = @ARCHIVE@ ARADD = @ARADD@ @@ -16,7 +17,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/des425/configure.in b/src/lib/des425/configure.in index f0cb91d..504b0c7 100644 --- a/src/lib/des425/configure.in +++ b/src/lib/des425/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD AC_PROG_RANLIB diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in index 02f3bb2..1368579 100644 --- a/src/lib/gssapi/Makefile.in +++ b/src/lib/gssapi/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/lib/gssapi/configure.in b/src/lib/gssapi/configure.in index 7522785..21c9646 100644 --- a/src/lib/gssapi/configure.in +++ b/src/lib/gssapi/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(generic krb5) AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in index d644464..bc2359e 100644 --- a/src/lib/gssapi/generic/Makefile.in +++ b/src/lib/gssapi/generic/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -14,7 +15,6 @@ CP = cp AWK = @AWK@ -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/gssapi/generic/configure.in b/src/lib/gssapi/generic/configure.in index fe09467..3e74e53 100644 --- a/src/lib/gssapi/generic/configure.in +++ b/src/lib/gssapi/generic/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP ET_RULES CONFIG_RULES SubdirLibraryRule([${OBJS}]) diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in index b748bab..7a6e82a 100644 --- a/src/lib/gssapi/krb5/Makefile.in +++ b/src/lib/gssapi/krb5/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -14,7 +15,6 @@ CP = cp AWK = @AWK@ -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/gssapi/krb5/configure.in b/src/lib/gssapi/krb5/configure.in index 0843821..e5f2f6e 100644 --- a/src/lib/gssapi/krb5/configure.in +++ b/src/lib/gssapi/krb5/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP ET_RULES CONFIG_RULES SubdirLibraryRule([${OBJS}]) diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in index 1870b3a..369a8c7 100644 --- a/src/lib/kdb/Makefile.in +++ b/src/lib/kdb/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ RANLIB = @RANLIB@ ARCHIVE = @ARCHIVE@ ARADD = @ARADD@ @@ -14,7 +15,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/kdb/configure.in b/src/lib/kdb/configure.in index 576db04..fd132bd 100644 --- a/src/lib/kdb/configure.in +++ b/src/lib/kdb/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD AC_PROG_RANLIB diff --git a/src/lib/krb425/Makefile.in b/src/lib/krb425/Makefile.in index a5c0e87..c5b3ac2 100644 --- a/src/lib/krb425/Makefile.in +++ b/src/lib/krb425/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ RANLIB = @RANLIB@ ARCHIVE = @ARCHIVE@ ARADD = @ARADD@ @@ -18,7 +19,6 @@ CP = cp AWK = @AWK@ -BUILDTOP = ../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: krb_err.h includes $(OBJS) diff --git a/src/lib/krb425/configure.in b/src/lib/krb425/configure.in index 58ec1c0..f414b74 100644 --- a/src/lib/krb425/configure.in +++ b/src/lib/krb425/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP ET_RULES AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in index 4da82a9..c8e03d6 100644 --- a/src/lib/krb5/Makefile.in +++ b/src/lib/krb5/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in index ee4ff46..c0a86e5 100644 --- a/src/lib/krb5/asn.1/Makefile.in +++ b/src/lib/krb5/asn.1/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -11,7 +12,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. PEPSY = @PEPSY@ PSYFLAGS = @PSYFLAGS@ diff --git a/src/lib/krb5/asn.1/configure.in b/src/lib/krb5/asn.1/configure.in index 2cf4f07..5dc1c4e 100644 --- a/src/lib/krb5/asn.1/configure.in +++ b/src/lib/krb5/asn.1/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP UsePepsy CONFIG_RULES SubdirLibraryRule([${OBJS}]) diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in index b8f12a3..a2a1deb 100644 --- a/src/lib/krb5/ccache/Makefile.in +++ b/src/lib/krb5/ccache/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -12,7 +13,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/krb5/ccache/configure.in b/src/lib/krb5/ccache/configure.in index c3f6027..aae1422 100644 --- a/src/lib/krb5/ccache/configure.in +++ b/src/lib/krb5/ccache/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(file stdio) AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD diff --git a/src/lib/krb5/ccache/file/Makefile.in b/src/lib/krb5/ccache/file/Makefile.in index 9050efd..4042d5c 100644 --- a/src/lib/krb5/ccache/file/Makefile.in +++ b/src/lib/krb5/ccache/file/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -10,7 +11,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/krb5/ccache/file/configure.in b/src/lib/krb5/ccache/file/configure.in index 184c6f4..cc5e8f0 100644 --- a/src/lib/krb5/ccache/file/configure.in +++ b/src/lib/krb5/ccache/file/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/lib/krb5/ccache/stdio/Makefile.in b/src/lib/krb5/ccache/stdio/Makefile.in index e7acee5..4d30ca4 100644 --- a/src/lib/krb5/ccache/stdio/Makefile.in +++ b/src/lib/krb5/ccache/stdio/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -10,7 +11,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/krb5/ccache/stdio/configure.in b/src/lib/krb5/ccache/stdio/configure.in index 184c6f4..cc5e8f0 100644 --- a/src/lib/krb5/ccache/stdio/configure.in +++ b/src/lib/krb5/ccache/stdio/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in index 5e83493..33b71b3 100644 --- a/src/lib/krb5/configure.in +++ b/src/lib/krb5/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(error_tables asn.1 ccache keytab krb rcache free os posix) AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in index 7ce525c..7be230d 100644 --- a/src/lib/krb5/error_tables/Makefile.in +++ b/src/lib/krb5/error_tables/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -12,7 +13,6 @@ CP = cp AWK = @AWK@ -BUILDTOP = ../../.. EHDRDIR=$(BUILDTOP)/include/krb5 diff --git a/src/lib/krb5/error_tables/configure.in b/src/lib/krb5/error_tables/configure.in index de80b5a..0043f2a 100644 --- a/src/lib/krb5/error_tables/configure.in +++ b/src/lib/krb5/error_tables/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP ET_RULES SS_RULES CONFIG_RULES diff --git a/src/lib/krb5/free/Makefile.in b/src/lib/krb5/free/Makefile.in index c1f65c6..fde268c 100644 --- a/src/lib/krb5/free/Makefile.in +++ b/src/lib/krb5/free/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -12,7 +13,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/krb5/free/configure.in b/src/lib/krb5/free/configure.in index 465abd0..ceccb72 100644 --- a/src/lib/krb5/free/configure.in +++ b/src/lib/krb5/free/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in index 48f0cca..3c9fab6 100644 --- a/src/lib/krb5/keytab/Makefile.in +++ b/src/lib/krb5/keytab/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -12,7 +13,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/krb5/keytab/configure.in b/src/lib/krb5/keytab/configure.in index f95f462..6e557cb 100644 --- a/src/lib/krb5/keytab/configure.in +++ b/src/lib/krb5/keytab/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(file) AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD diff --git a/src/lib/krb5/keytab/file/Makefile.in b/src/lib/krb5/keytab/file/Makefile.in index cacaedb..8f2cead 100644 --- a/src/lib/krb5/keytab/file/Makefile.in +++ b/src/lib/krb5/keytab/file/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -10,7 +11,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/krb5/keytab/file/configure.in b/src/lib/krb5/keytab/file/configure.in index 184c6f4..cc5e8f0 100644 --- a/src/lib/krb5/keytab/file/configure.in +++ b/src/lib/krb5/keytab/file/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in index 56990f9..70ef547 100644 --- a/src/lib/krb5/krb/Makefile.in +++ b/src/lib/krb5/krb/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -12,7 +13,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/krb5/krb/configure.in b/src/lib/krb5/krb/configure.in index 3f298de..09b8861 100644 --- a/src/lib/krb5/krb/configure.in +++ b/src/lib/krb5/krb/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD AC_PROG_RANLIB diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in index 893cfd4..33d5ee3 100644 --- a/src/lib/krb5/os/Makefile.in +++ b/src/lib/krb5/os/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -10,7 +11,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/krb5/os/configure.in b/src/lib/krb5/os/configure.in index 465abd0..ceccb72 100644 --- a/src/lib/krb5/os/configure.in +++ b/src/lib/krb5/os/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/lib/krb5/posix/Makefile.in b/src/lib/krb5/posix/Makefile.in index 26eb2ea..fa76077 100644 --- a/src/lib/krb5/posix/Makefile.in +++ b/src/lib/krb5/posix/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -12,7 +13,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/krb5/posix/configure.in b/src/lib/krb5/posix/configure.in index 9400c46..8afcc40 100644 --- a/src/lib/krb5/posix/configure.in +++ b/src/lib/krb5/posix/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in index 6157274..baa147f 100644 --- a/src/lib/krb5/rcache/Makefile.in +++ b/src/lib/krb5/rcache/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ SUBDIRS = @SUBDIRS@ srcdir = @srcdir@ @@ -12,7 +13,6 @@ LDFLAGS = -g RM = rm -f CP = cp -BUILDTOP = ../../.. SRCTOP = $(srcdir)/$(BUILDTOP) all:: $(OBJS) diff --git a/src/lib/krb5/rcache/configure.in b/src/lib/krb5/rcache/configure.in index 465abd0..ceccb72 100644 --- a/src/lib/krb5/rcache/configure.in +++ b/src/lib/krb5/rcache/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in index cfda032..8a31cd1 100644 --- a/src/slave/Makefile.in +++ b/src/slave/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -7,7 +8,6 @@ LIBS = @LIBS@ CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g -BUILDTOP=.. SRCTOP = $(srcdir)/$(BUILDTOP) TOPLIBD = $(BUILDTOP)/lib ISODELIB=$(TOPLIBD)/libisode.a diff --git a/src/slave/configure.in b/src/slave/configure.in index da7aea5..b47fdca 100644 --- a/src/slave/configure.in +++ b/src/slave/configure.in @@ -1,4 +1,5 @@ AC_INIT(kprop.c) +AC_SET_BUILDTOP AC_HAVE_LIBRARY(socket) AC_HAVE_LIBRARY(nsl) AC_HAVE_LIBRARY(util) diff --git a/src/util/Makefile.in b/src/util/Makefile.in index 2cc2702..6fd0859 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/util/configure.in b/src/util/configure.in index e2387b4..4fde823 100644 --- a/src/util/configure.in +++ b/src/util/configure.in @@ -1,4 +1,5 @@ AC_INIT(configure.in) +AC_SET_BUILDTOP CONFIG_DIRS(unifdef et ss) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in index 0d3057a..ae02224 100644 --- a/src/util/et/Makefile.in +++ b/src/util/et/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -16,7 +17,6 @@ RM = rm -f all:: -BUILDTOP=../.. LINTFLAGS=-uhvb LINTFILES= error_message.c et_name.c init_et.c com_err.c LIBOBJS= error_message.o et_name.o init_et.o com_err.o diff --git a/src/util/et/configure.in b/src/util/et/configure.in index 8a40695..248361e 100644 --- a/src/util/et/configure.in +++ b/src/util/et/configure.in @@ -1,4 +1,5 @@ AC_INIT(error_table.y) +AC_SET_BUILDTOP AC_PROG_LEX AC_PROG_ARCHIVE AC_PROG_RANLIB diff --git a/src/util/ss/Makefile.in b/src/util/ss/Makefile.in index 99a1cdd..de6e49c 100644 --- a/src/util/ss/Makefile.in +++ b/src/util/ss/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -22,7 +23,6 @@ CHMOD=chmod all:: -BUILDTOP=../.. TOP=$(BUILDTOP) # hard coded srcdir/.. is so that ss/ss.h works diff --git a/src/util/ss/configure.in b/src/util/ss/configure.in index 8bc4bdd..915afe4 100644 --- a/src/util/ss/configure.in +++ b/src/util/ss/configure.in @@ -1,4 +1,5 @@ AC_INIT(ct.y) +AC_SET_BUILDTOP AC_PROG_LEX AC_PROG_ARCHIVE AC_PROG_RANLIB diff --git a/src/util/unifdef/Makefile.in b/src/util/unifdef/Makefile.in index 88765b4..c8670fd 100644 --- a/src/util/unifdef/Makefile.in +++ b/src/util/unifdef/Makefile.in @@ -1,3 +1,4 @@ +BUILDTOP=@BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/src/util/unifdef/configure.in b/src/util/unifdef/configure.in index f56fa10..0bfc43b 100644 --- a/src/util/unifdef/configure.in +++ b/src/util/unifdef/configure.in @@ -1,3 +1,4 @@ AC_INIT(unifdef.c) +AC_SET_BUILDTOP CONFIG_RULES AC_OUTPUT(Makefile,[EXTRA_RULES]) |