krb5 commit: Reduce boilerplate in makefiles
Greg Hudson
ghudson at MIT.EDU
Thu May 16 21:18:36 EDT 2013
https://github.com/krb5/krb5/commit/4b0985f8573840838bcfa8ec1df3dcd39a3dbf15
commit 4b0985f8573840838bcfa8ec1df3dcd39a3dbf15
Author: Greg Hudson <ghudson at mit.edu>
Date: Thu May 16 14:21:12 2013 -0400
Reduce boilerplate in makefiles
Provide default values in pre.in for PROG_LIBPATH, PROG_RPATH,
SHLIB_DIRS, SHLIB_RDIRS, and STOBJLISTS so that they don't have to be
specified in the common case. Rename KRB5_RUN_ENV and KRB5_RUN_VARS
to RUN_SETUP (already the most commonly used name) and RUN_VARS. Make
sure to use DEFINES for local defines (not DEFS). Remove some other
unnecessary makefile content.
src/Makefile.in | 7 +---
src/appl/gss-sample/Makefile.in | 2 -
src/appl/sample/sclient/Makefile.in | 3 --
src/appl/sample/sserver/Makefile.in | 3 --
src/appl/simple/client/Makefile.in | 4 +--
src/appl/simple/server/Makefile.in | 5 +---
src/appl/user_user/Makefile.in | 2 -
src/clients/kcpytkt/Makefile.in | 3 --
src/clients/kdeltkt/Makefile.in | 3 --
src/clients/kdestroy/Makefile.in | 4 ---
src/clients/kinit/Makefile.in | 4 ---
src/clients/klist/Makefile.in | 4 ---
src/clients/kpasswd/Makefile.in | 3 --
src/clients/ksu/Makefile.in | 4 ---
src/clients/kswitch/Makefile.in | 4 ---
src/clients/kvno/Makefile.in | 4 ---
src/config/lib.in | 14 ++--------
src/config/libnover.in | 14 ++--------
src/config/pre.in | 30 ++++++++++++++-------
src/kadmin/cli/Makefile.in | 3 --
src/kadmin/dbutil/Makefile.in | 3 --
src/kadmin/ktutil/Makefile.in | 3 --
src/kadmin/server/Makefile.in | 4 ---
src/kadmin/testing/util/Makefile.in | 1 -
src/kdc/Makefile.in | 7 +----
src/lib/apputils/Makefile.in | 2 -
src/lib/crypto/Makefile.in | 12 --------
src/lib/crypto/builtin/Makefile.in | 4 ---
src/lib/crypto/builtin/aes/Makefile.in | 7 +----
src/lib/crypto/builtin/camellia/Makefile.in | 21 ++++-----------
src/lib/crypto/builtin/des/Makefile.in | 6 ----
src/lib/crypto/builtin/enc_provider/Makefile.in | 4 ---
src/lib/crypto/builtin/hash_provider/Makefile.in | 4 ---
src/lib/crypto/builtin/md4/Makefile.in | 4 ---
src/lib/crypto/builtin/md5/Makefile.in | 4 ---
src/lib/crypto/builtin/sha1/Makefile.in | 5 ---
src/lib/crypto/builtin/sha2/Makefile.in | 5 ---
src/lib/crypto/crypto_tests/Makefile.in | 4 ---
src/lib/crypto/krb/Makefile.in | 9 +------
src/lib/crypto/nss/Makefile.in | 4 ---
src/lib/crypto/nss/aes/Makefile.in | 24 -----------------
src/lib/crypto/nss/camellia/Makefile.in | 24 -----------------
src/lib/crypto/nss/des/Makefile.in | 6 ----
src/lib/crypto/nss/enc_provider/Makefile.in | 4 ---
src/lib/crypto/nss/hash_provider/Makefile.in | 5 ---
src/lib/crypto/nss/md4/Makefile.in | 3 --
src/lib/crypto/nss/md5/Makefile.in | 12 --------
src/lib/crypto/nss/sha1/Makefile.in | 19 --------------
src/lib/crypto/nss/sha2/Makefile.in | 12 --------
src/lib/crypto/openssl/Makefile.in | 3 --
src/lib/crypto/openssl/aes/Makefile.in | 18 -------------
src/lib/crypto/openssl/camellia/Makefile.in | 24 -----------------
src/lib/crypto/openssl/des/Makefile.in | 5 ---
src/lib/crypto/openssl/enc_provider/Makefile.in | 4 ---
src/lib/crypto/openssl/hash_provider/Makefile.in | 4 ---
src/lib/crypto/openssl/md4/Makefile.in | 19 --------------
src/lib/crypto/openssl/md5/Makefile.in | 18 -------------
src/lib/crypto/openssl/sha1/Makefile.in | 18 -------------
src/lib/crypto/openssl/sha2/Makefile.in | 22 ----------------
src/lib/gssapi/Makefile.in | 4 +--
src/lib/gssapi/generic/Makefile.in | 1 -
src/lib/gssapi/krb5/Makefile.in | 7 +----
src/lib/gssapi/mechglue/Makefile.in | 2 +-
src/lib/gssapi/spnego/Makefile.in | 2 +-
src/lib/kadm5/Makefile.in | 1 -
src/lib/kadm5/clnt/Makefile.in | 3 --
src/lib/kadm5/srv/Makefile.in | 3 --
src/lib/kadm5/unit-test/Makefile.in | 4 ---
src/lib/kdb/Makefile.in | 11 +-------
src/lib/krb5/Makefile.in | 4 +--
src/lib/krb5/asn.1/Makefile.in | 1 -
src/lib/krb5/ccache/Makefile.in | 7 +----
src/lib/krb5/ccache/ccapi/Makefile.in | 2 +-
src/lib/krb5/error_tables/Makefile.in | 1 -
src/lib/krb5/keytab/Makefile.in | 5 ---
src/lib/krb5/krb/Makefile.in | 5 +---
src/lib/krb5/os/Makefile.in | 16 ++++-------
src/lib/krb5/posix/Makefile.in | 1 -
src/lib/krb5/rcache/Makefile.in | 3 --
src/lib/krb5/unicode/Makefile.in | 6 ----
src/lib/rpc/Makefile.in | 4 ---
src/lib/rpc/unit-test/Makefile.in | 4 ---
src/plugins/authdata/greet/Makefile.in | 14 ----------
src/plugins/authdata/greet_client/Makefile.in | 15 -----------
src/plugins/authdata/greet_server/Makefile.in | 14 ----------
src/plugins/kadm5_hook/test/Makefile.in | 14 ----------
src/plugins/kdb/db2/Makefile.in | 14 +---------
src/plugins/kdb/db2/libdb2/Makefile.in | 2 -
src/plugins/kdb/db2/libdb2/test/Makefile.in | 5 +---
src/plugins/kdb/hdb/Makefile.in | 15 -----------
src/plugins/kdb/ldap/Makefile.in | 10 -------
src/plugins/kdb/ldap/ldap_util/Makefile.in | 3 --
src/plugins/kdb/ldap/libkdb_ldap/Makefile.in | 8 ------
src/plugins/localauth/test/Makefile.in | 9 ------
src/plugins/locate/python/Makefile.in | 5 ---
src/plugins/preauth/cksum_body/Makefile.in | 14 ----------
src/plugins/preauth/pkinit/Makefile.in | 14 +---------
src/plugins/preauth/securid_sam2/Makefile.in | 14 ----------
src/plugins/preauth/wpse/Makefile.in | 16 +-----------
src/slave/Makefile.in | 3 --
src/tests/Makefile.in | 3 --
src/tests/asn.1/Makefile.in | 4 ---
src/tests/create/Makefile.in | 2 -
src/tests/dejagnu/Makefile.in | 5 +---
src/tests/gss-threads/Makefile.in | 2 -
src/tests/gssapi/Makefile.in | 4 +--
src/tests/hammer/Makefile.in | 2 -
src/tests/misc/Makefile.in | 3 --
src/tests/mkeystash_compat/Makefile.in | 3 --
src/tests/resolve/Makefile.in | 3 --
src/tests/shlib/Makefile.in | 4 ---
src/tests/threads/Makefile.in | 4 ---
src/tests/verify/Makefile.in | 2 -
src/util/collected-client-lib/Makefile.in | 6 ----
src/util/et/Makefile.in | 8 ------
src/util/gss-kernel-lib/Makefile.in | 5 ---
src/util/profile/Makefile.in | 12 ++------
src/util/profile/testmod/Makefile.in | 6 ----
src/util/ss/Makefile.in | 3 --
src/util/support/Makefile.in | 13 ---------
src/util/verto/Makefile.in | 3 --
121 files changed, 63 insertions(+), 797 deletions(-)
diff --git a/src/Makefile.in b/src/Makefile.in
index d62033a..cea7dda 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -18,9 +18,6 @@ SUBDIRS=util include lib \
config-files build-tools man doc @po@
WINSUBDIRS=include util lib ccapi windows clients appl
BUILDTOP=$(REL).
-LOCALINCLUDES = -I$(srcdir)
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
SRCS =
HDRS =
@@ -545,8 +542,8 @@ testrealm: runenv.py
# environment variable settings to propagate to Python-based tests
pyrunenv.vals: Makefile
- $(KRB5_RUN_ENV) \
- for i in $(KRB5_RUN_VARS); do \
+ $(RUN_SETUP) \
+ for i in $(RUN_VARS); do \
eval echo 'env['\\\'$$i\\\''] = '\\\'\$$$$i\\\'; \
done > $@
diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in
index 87931b9..0f67c0c 100644
--- a/src/appl/gss-sample/Makefile.in
+++ b/src/appl/gss-sample/Makefile.in
@@ -1,8 +1,6 @@
mydir=appl$(S)gss-sample
BUILDTOP=$(REL)..$(S)..
DEFINES = -DUSE_AUTOCONF_H -DGSSAPI_V2
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
SRCS= $(srcdir)/gss-client.c $(srcdir)/gss-misc.c $(srcdir)/gss-server.c
diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in
index 069c420..3d8df33 100644
--- a/src/appl/sample/sclient/Makefile.in
+++ b/src/appl/sample/sclient/Makefile.in
@@ -1,8 +1,5 @@
mydir=appl$(S)sample$(S)sclient
-
BUILDTOP=$(REL)..$(S)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
all:: sclient
diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in
index 7205788..634e5a6 100644
--- a/src/appl/sample/sserver/Makefile.in
+++ b/src/appl/sample/sserver/Makefile.in
@@ -1,8 +1,5 @@
mydir=appl$(S)sample$(S)sserver
-
BUILDTOP=$(REL)..$(S)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
all:: sserver
diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in
index c357c12..d59baac 100644
--- a/src/appl/simple/client/Makefile.in
+++ b/src/appl/simple/client/Makefile.in
@@ -1,11 +1,9 @@
mydir=appl$(S)simple$(S)client
BUILDTOP=$(REL)..$(S)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
all:: sim_client
-LOCALINCLUDES= -I.. -I$(srcdir)/..
+LOCALINCLUDES= -I$(srcdir)/..
sim_client: sim_client.o $(KRB5_BASE_DEPLIBS)
$(CC_LINK) -o sim_client sim_client.o $(KRB5_BASE_LIBS)
diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in
index 1795bc8..a992645 100644
--- a/src/appl/simple/server/Makefile.in
+++ b/src/appl/simple/server/Makefile.in
@@ -1,10 +1,7 @@
mydir=appl$(S)simple$(S)server
BUILDTOP=$(REL)..$(S)..$(S)..
-LOCALINCLUDES= -I.. -I$(srcdir)/..
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
+LOCALINCLUDES= -I$(srcdir)/..
all:: sim_server
diff --git a/src/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in
index 20ddc59..8640860 100644
--- a/src/appl/user_user/Makefile.in
+++ b/src/appl/user_user/Makefile.in
@@ -2,8 +2,6 @@ mydir=appl$(S)user_user
BUILDTOP=$(REL)..$(S)..
# If you remove the -DDEBUG, the test program needs a line changed
DEFINES = -DDEBUG
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
all:: uuclient uuserver
diff --git a/src/clients/kcpytkt/Makefile.in b/src/clients/kcpytkt/Makefile.in
index c4e81c1..ea73514 100644
--- a/src/clients/kcpytkt/Makefile.in
+++ b/src/clients/kcpytkt/Makefile.in
@@ -1,9 +1,6 @@
mydir=kcpytkt
BUILDTOP=$(REL)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
##WIN32##VERSIONRC = $(BUILDTOP)\windows\version.rc
##WIN32##RCFLAGS=$(CPPFLAGS) -I$(top_srcdir) -D_WIN32 -DRES_ONLY
diff --git a/src/clients/kdeltkt/Makefile.in b/src/clients/kdeltkt/Makefile.in
index 5c7b183..e140b7b 100644
--- a/src/clients/kdeltkt/Makefile.in
+++ b/src/clients/kdeltkt/Makefile.in
@@ -1,9 +1,6 @@
mydir=kvno
BUILDTOP=$(REL)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
##WIN32##VERSIONRC = $(BUILDTOP)\windows\version.rc
##WIN32##RCFLAGS=$(CPPFLAGS) -I$(top_srcdir) -D_WIN32 -DRES_ONLY
diff --git a/src/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in
index e3d1c67..f299352 100644
--- a/src/clients/kdestroy/Makefile.in
+++ b/src/clients/kdestroy/Makefile.in
@@ -1,14 +1,10 @@
mydir=clients$(S)kdestroy
BUILDTOP=$(REL)..$(S)..
-DEFS=
##WIN32##LOCALINCLUDES=-I$(BUILDTOP)\util\windows\
SRCS=kdestroy.c
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
##WIN32##VERSIONRC = $(BUILDTOP)\windows\version.rc
##WIN32##RCFLAGS=$(CPPFLAGS) -I$(top_srcdir) -D_WIN32 -DRES_ONLY
diff --git a/src/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in
index 44e3774..b1cd278 100644
--- a/src/clients/kinit/Makefile.in
+++ b/src/clients/kinit/Makefile.in
@@ -1,9 +1,5 @@
mydir=clients$(S)kinit
BUILDTOP=$(REL)..$(S)..
-DEFS=
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
SRCS=kinit.c kinit_kdb.c
diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in
index 20d66ab..3cdbb86 100644
--- a/src/clients/klist/Makefile.in
+++ b/src/clients/klist/Makefile.in
@@ -1,9 +1,5 @@
mydir=clients$(S)klist
BUILDTOP=$(REL)..$(S)..
-DEFS=
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
##WIN32##LOCALINCLUDES=-I$(BUILDTOP)\util\windows\
diff --git a/src/clients/kpasswd/Makefile.in b/src/clients/kpasswd/Makefile.in
index 09ca194..3445c9f 100644
--- a/src/clients/kpasswd/Makefile.in
+++ b/src/clients/kpasswd/Makefile.in
@@ -1,8 +1,5 @@
mydir=clients$(S)kpasswd
BUILDTOP=$(REL)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
SRCS=kpasswd.c ksetpwd.c
diff --git a/src/clients/ksu/Makefile.in b/src/clients/ksu/Makefile.in
index 6cecf0d..c705fda 100644
--- a/src/clients/ksu/Makefile.in
+++ b/src/clients/ksu/Makefile.in
@@ -1,10 +1,6 @@
mydir=clients$(S)ksu
BUILDTOP=$(REL)..$(S)..
DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"'
-DEFS=
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
KSU_LIBS=@KSU_LIBS@
diff --git a/src/clients/kswitch/Makefile.in b/src/clients/kswitch/Makefile.in
index 2ae457b..b46fec6 100644
--- a/src/clients/kswitch/Makefile.in
+++ b/src/clients/kswitch/Makefile.in
@@ -1,12 +1,8 @@
mydir=clients$(S)kswitch
BUILDTOP=$(REL)..$(S)..
-DEFS=
SRCS=kswitch.c
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
##WIN32##VERSIONRC = $(BUILDTOP)\windows\version.rc
##WIN32##RCFLAGS=$(CPPFLAGS) -I$(top_srcdir) -D_WIN32 -DRES_ONLY
diff --git a/src/clients/kvno/Makefile.in b/src/clients/kvno/Makefile.in
index 16ade48..58519ae 100644
--- a/src/clients/kvno/Makefile.in
+++ b/src/clients/kvno/Makefile.in
@@ -1,14 +1,10 @@
mydir=clients$(S)kvno
BUILDTOP=$(REL)..$(S)..
-DEFS=
##WIN32##LOCALINCLUDES=-I$(BUILDTOP)\util\windows\
SRCS=kvno.c
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
##WIN32##VERSIONRC = $(BUILDTOP)\windows\version.rc
##WIN32##RCFLAGS=$(CPPFLAGS) -I$(top_srcdir) -D_WIN32 -DRES_ONLY
diff --git a/src/config/lib.in b/src/config/lib.in
index 26d1d5a..8dd5475 100644
--- a/src/config/lib.in
+++ b/src/config/lib.in
@@ -8,25 +8,17 @@
# LIBBASE library name without "lib" or extension
# LIBMAJOR library major version
# LIBMINOR library minor version
-# STOBJLISTS list of files, each of which is an OBJS.ST created by
-# libobj.in; *DO NOT* use ./OBJS.ST for the current
-# directory as that will cause some makes to lose.
# SHLIB_EXPDEPS list of libraries that this one has explicit
# dependencies on, pref. in the form libfoo$(SHLIBEXT)
# SHLIB_EXPLIBS list of libraries that this one has explicit
# dependencies on, in "-lfoo" form.
-# SHLIB_DIRS list of directories where $(SHLIB_EXPLIBS) can be
-# found, in the form -Ldir1 -Ldir2 ...
-# since there are very few systems where -L is the
-# wrong thing (notable exception of SunOS but we
-# deal with it...)
-# SHLIB_RDIRS rpath directories to search; given in the
-# form dir1:dir2 ...
# RELDIR path to this directory relative to $(TOPLIBD)
+#
+# Makefile.in can also override the defaults for SHLIB_DIRS,
+# SHLIB_RDIRS, and STOBJLISTS from pre.in.
LIBPREFIX=lib
-# STOBJLISTS=dir1/OBJS.ST dir2/OBJS.ST etc...
SHOBJLISTS=$(STOBJLISTS:.ST=.SH)
PFOBJLISTS=$(STOBJLISTS:.ST=.PF)
diff --git a/src/config/libnover.in b/src/config/libnover.in
index 4214aed..b55a427 100644
--- a/src/config/libnover.in
+++ b/src/config/libnover.in
@@ -7,25 +7,17 @@
# The following variables must be set in the Makefile.in:
#
# LIBBASE library name without "lib" or extension
-# STOBJLISTS list of files, each of which is an OBJS.ST created by
-# libobj.in; *DO NOT* use ./OBJS.ST for the current
-# directory as that will cause some makes to lose.
# SHLIB_EXPDEPS list of libraries that this one has explicit
# dependencies on, pref. in the form libfoo$(SHLIBEXT)
# SHLIB_EXPLIBS list of libraries that this one has explicit
# dependencies on, in "-lfoo" form.
-# SHLIB_DIRS list of directories where $(SHLIB_EXPLIBS) can be
-# found, in the form -Ldir1 -Ldir2 ...
-# since there are very few systems where -L is the
-# wrong thing (notable exception of SunOS but we
-# deal with it...)
-# SHLIB_RDIRS rpath directories to search; given in the
-# form dir1:dir2 ...
# RELDIR path to this directory relative to $(TOPLIBD)
+#
+# Makefile.in can also override the defaults for SHLIB_DIRS,
+# SHLIB_RDIRS, and STOBJLISTS from pre.in.
LIBPREFIX=
-# STOBJLISTS=dir1/OBJS.ST dir2/OBJS.ST etc...
SHOBJLISTS=$(STOBJLISTS:.ST=.SH)
PFOBJLISTS=$(STOBJLISTS:.ST=.PF)
diff --git a/src/config/pre.in b/src/config/pre.in
index bf6c93b..fbc5c11 100644
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -275,21 +275,31 @@ EXEEXT =
# variables for libraries, for use in linking programs
# -- this may want to get broken out into a separate frag later
#
-#
-# Note: the following variables must be set in any Makefile.in that
-# uses KRB5_BUILD_PROGRAM
-#
-# PROG_LIBPATH list of dirs, in -Ldir form, to search for libraries at link
-# PROG_RPATH list of dirs, in dir1:dir2 form, for rpath purposes
-#
# invocation is like:
# prog: foo.o bar.o $(KRB5_BASE_DEPLIBS)
# $(CC_LINK) -o $@ foo.o bar.o $(KRB5_BASE_LIBS)
-
CC_LINK=@CC_LINK@
CXX_LINK=@CXX_LINK@
+# Makefile.in files which build programs can override the list of
+# directories to look for dependent libraries in (in the form -Ldir1
+# -Ldir2 ...) and also the list of rpath directories to search (in the
+# form dir1:dir2:...).
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
+
+# Library Makefile.in files can override this list of directories to
+# look for dependent libraries in (in the form -Ldir1 -Ldir2 ...) and
+# also the list of rpath directories to search (in the form
+# dir1:dir2:...)
+SHLIB_DIRS=-L$(TOPLIBD)
+SHLIB_RDIRS=$(KRB5_LIBDIR)
+
+# Multi-directory library Makefile.in files should override this list
+# of object files with the full list.
+STOBJLISTS=OBJS.ST
+
# prefix (with no spaces after) for rpath flag to cc
RPATH_FLAG=@RPATH_FLAG@
@@ -398,8 +408,8 @@ KADMCLNT_LIBS = -lkadm5clnt_mit $(KADM_COMM_LIBS)
APPUTILS_LIB = -lapputils
# So test programs can find their libraries without "make install", etc.
-KRB5_RUN_ENV=@KRB5_RUN_ENV@
-KRB5_RUN_VARS=@KRB5_RUN_VARS@
+RUN_SETUP=@KRB5_RUN_ENV@
+RUN_VARS=@KRB5_RUN_VARS@
#
# variables for --with-tcl=
diff --git a/src/kadmin/cli/Makefile.in b/src/kadmin/cli/Makefile.in
index 2681399..789c597 100644
--- a/src/kadmin/cli/Makefile.in
+++ b/src/kadmin/cli/Makefile.in
@@ -1,9 +1,6 @@
mydir=kadmin$(S)cli
BUILDTOP=$(REL)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
-DEFS=
PROG = kadmin
COMMON_OBJS = kadmin.o kadmin_ct.o ss_wrapper.o getdate.o
diff --git a/src/kadmin/dbutil/Makefile.in b/src/kadmin/dbutil/Makefile.in
index 58c517a..047587a 100644
--- a/src/kadmin/dbutil/Makefile.in
+++ b/src/kadmin/dbutil/Makefile.in
@@ -1,9 +1,6 @@
mydir=kadmin$(S)dbutil
BUILDTOP=$(REL)..$(S)..
-DEFS=
LOCALINCLUDES = -I.
-PROG_LIBPATH=-L$(TOPLIBD) $(KRB5_LIBPATH)
-PROG_RPATH=$(KRB5_LIBDIR)
KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
PROG = kdb5_util
diff --git a/src/kadmin/ktutil/Makefile.in b/src/kadmin/ktutil/Makefile.in
index f92bcb2..e92f84f 100644
--- a/src/kadmin/ktutil/Makefile.in
+++ b/src/kadmin/ktutil/Makefile.in
@@ -1,8 +1,5 @@
mydir=kadmin$(S)ktutil
BUILDTOP=$(REL)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
OBJS= ktutil.o \
ktutil_ct.o \
diff --git a/src/kadmin/server/Makefile.in b/src/kadmin/server/Makefile.in
index 694227d..3218307 100644
--- a/src/kadmin/server/Makefile.in
+++ b/src/kadmin/server/Makefile.in
@@ -1,15 +1,11 @@
mydir=kadmin$(S)server
BUILDTOP=$(REL)..$(S)..
KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
-DEFS=
LOCALINCLUDES = -I$(top_srcdir)/lib/gssapi/generic \
-I$(top_srcdir)/lib/gssapi/krb5 -I$(BUILDTOP)/lib/gssapi/generic \
-I$(BUILDTOP)/lib/gssapi/krb5 -I$(top_srcdir)/lib/kadm5/srv
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
PROG = kadmind
OBJS = kadm_rpc_svc.o server_stubs.o ovsec_kadmd.o schpw.o misc.o ipropd_svc.o
SRCS = kadm_rpc_svc.c server_stubs.c ovsec_kadmd.c schpw.c misc.c ipropd_svc.c
diff --git a/src/kadmin/testing/util/Makefile.in b/src/kadmin/testing/util/Makefile.in
index 745a73d..6bb6f60 100644
--- a/src/kadmin/testing/util/Makefile.in
+++ b/src/kadmin/testing/util/Makefile.in
@@ -4,7 +4,6 @@ LOCALINCLUDES = $(TCL_INCLUDES) -I$(BUILDTOP)/lib/kdb/
# Force Tcl headers to use stdarg.h, because krb5 does too, and if
# Tcl uses varargs.h it'll just mess things up.
DEFINES= -DHAS_STDARG
-DEFS=
KRB5_PTHREAD_LIB=$(THREAD_LINKOPTS)
PROG_LIBPATH=-L$(TOPLIBD) $(TCL_LIBPATH)
diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
index 5206f21..1b3b19b 100644
--- a/src/kdc/Makefile.in
+++ b/src/kdc/Makefile.in
@@ -1,11 +1,6 @@
mydir=kdc
BUILDTOP=$(REL)..
-DEFINES =
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
-KDB5_LIB_DEPS=$(DL_LIB) $(THREAD_LINKOPTS)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=-DLIBDIR=\"$(KRB5_LIBDIR)\"
+DEFINES=-DLIBDIR=\"$(KRB5_LIBDIR)\"
all:: krb5kdc rtest
diff --git a/src/lib/apputils/Makefile.in b/src/lib/apputils/Makefile.in
index 75dd613..d7fe336 100644
--- a/src/lib/apputils/Makefile.in
+++ b/src/lib/apputils/Makefile.in
@@ -6,7 +6,6 @@ mydir=lib$(S)apputils
BUILDTOP=$(REL)..$(S)..
RELDIR=../lib/apputils
SED = sed
-DEFS=
##DOS##BUILDTOP = ..\..
##DOS##LIBNAME=$(OUTPRE)apputils.lib
@@ -14,7 +13,6 @@ DEFS=
##DOS##OBJFILE=$(OUTPRE)apputils.lst
STLIBOBJS=net-server.o @LIBOBJS@
-STOBJLISTS=OBJS.ST
LIBBASE=apputils
all-unix:: all-liblinks
diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index 6098f91..a036022 100644
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -2,15 +2,6 @@ mydir=lib$(S)crypto
BUILDTOP=$(REL)..$(S)..
SUBDIRS= krb $(CRYPTO_IMPL) crypto_tests
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
-
LIBBASE=k5crypto
LIBMAJOR=3
LIBMINOR=1
@@ -38,12 +29,9 @@ SUBDIROBJLISTS=$(CRYPTO_IMPL)/enc_provider/OBJS.ST \
# link editor and loader support it.
DEPLIBS=
CRYPTO_IMPL_LIBS=@CRYPTO_IMPL_LIBS@
-SHLIB_DIRS=-L$(TOPLIBD)
SHLIB_EXPLIBS= $(SUPPORT_LIB) $(CRYPTO_IMPL_LIBS) $(LIBS)
SHLIB_EXPDEPLIBS= $(SUPPORT_DEPLIB)
SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
-SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
-SHLIB_RDIRS=$(KRB5_LIBDIR)
##DOS##LIBNAME=$(OUTPRE)crypto.lib
##DOS##OBJFILEDEP=$(OUTPRE)krb.lst $(OUTPRE)aes.lst $(OUTPRE)enc_provider.lst $(OUTPRE)des.lst $(OUTPRE)md5.lst $(OUTPRE)camellia.lst $(OUTPRE)md4.lst $(OUTPRE)hash_provider.lst $(OUTPRE)sha2.lst $(OUTPRE)sha1.lst $(OUTPRE)builtin.lst
diff --git a/src/lib/crypto/builtin/Makefile.in b/src/lib/crypto/builtin/Makefile.in
index 612d8f1..06312fa 100644
--- a/src/lib/crypto/builtin/Makefile.in
+++ b/src/lib/crypto/builtin/Makefile.in
@@ -2,10 +2,6 @@ mydir=lib$(S)crypto$(S)builtin
BUILDTOP=$(REL)..$(S)..$(S)..
SUBDIRS=camellia des aes md4 md5 sha1 sha2 enc_provider hash_provider
LOCALINCLUDES = -I$(srcdir)/../krb -I$(srcdir)
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
##DOS##BUILDTOP = ..\..\..
##DOS##PREFIXDIR = builtin
diff --git a/src/lib/crypto/builtin/aes/Makefile.in b/src/lib/crypto/builtin/aes/Makefile.in
index 9a242cc..f19604f 100644
--- a/src/lib/crypto/builtin/aes/Makefile.in
+++ b/src/lib/crypto/builtin/aes/Makefile.in
@@ -1,15 +1,10 @@
mydir=lib$(S)crypto$(S)builtin$(S)aes
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk -I$(srcdir)/../../../../include
-DEFS=
##DOS##BUILDTOP = ..\..\..\..
##DOS##PREFIXDIR = builtin\aes
##DOS##OBJFILE = ..\..\$(OUTPRE)aes.lst
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
STLIBOBJS=\
aescrypt.o \
aestab.o \
@@ -39,7 +34,7 @@ includes:: depend
depend:: $(SRCS)
aes-gen: aes-gen.o $(GEN_OBJS)
- $(CC_LINK) -I../../../../include $(LOCALINCLUDES) -o aes-gen aes-gen.o $(GEN_OBJS)
+ $(CC_LINK) -o aes-gen aes-gen.o $(GEN_OBJS)
run-aes-gen: aes-gen
./aes-gen > kresults.out
diff --git a/src/lib/crypto/builtin/camellia/Makefile.in b/src/lib/crypto/builtin/camellia/Makefile.in
index e6c86bc..a15c6f9 100644
--- a/src/lib/crypto/builtin/camellia/Makefile.in
+++ b/src/lib/crypto/builtin/camellia/Makefile.in
@@ -2,28 +2,19 @@ thisconfigdir=../../../..
myfulldir=lib/crypto/builtin/camellia
mydir=lib$(S)crypto$(S)builtin$(S)camellia
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk \
- -I$(srcdir)/../../../../include -I$(srcdir)/../aes
-DEFS=
+LOCALINCLUDES = -I$(srcdir)/../aes
##DOS##BUILDTOP = ..\..\..\..
##DOS##PREFIXDIR = builtin\camellia
##DOS##OBJFILE = ..\..\$(OUTPRE)camellia.lst
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
+STLIBOBJS= camellia.o
-STLIBOBJS=\
- camellia.o
+OBJS= $(OUTPRE)camellia.$(OBJEXT)
-OBJS=\
- $(OUTPRE)camellia.$(OBJEXT)
+SRCS= $(srcdir)/camellia.c
-SRCS=\
- $(srcdir)/camellia.c
-
-GEN_OBJS=\
- $(OUTPRE)camellia.$(OBJEXT)
+GEN_OBJS= $(OUTPRE)camellia.$(OBJEXT)
##DOS##LIBOBJS = $(OBJS)
@@ -34,7 +25,7 @@ includes:: depend
depend:: $(SRCS)
camellia-gen: camellia-gen.o $(GEN_OBJS)
- $(CC_LINK) -I../../../../include $(LOCALINCLUDES) -o camellia-gen camellia-gen.o $(GEN_OBJS)
+ $(CC_LINK) -o camellia-gen camellia-gen.o $(GEN_OBJS)
run-camellia-gen: camellia-gen
./camellia-gen > kresults.out
diff --git a/src/lib/crypto/builtin/des/Makefile.in b/src/lib/crypto/builtin/des/Makefile.in
index 6a17b36..cf4567e 100644
--- a/src/lib/crypto/builtin/des/Makefile.in
+++ b/src/lib/crypto/builtin/des/Makefile.in
@@ -1,17 +1,11 @@
mydir=lib$(S)crypto$(S)builtin$(S)des
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb
-DEFS=
##DOS##BUILDTOP = ..\..\..\..
##DOS##PREFIXDIR = builtin\des
##DOS##OBJFILE = ..\..\$(OUTPRE)des.lst
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
-
STLIBOBJS=\
d3_aead.o \
d3_kysched.o \
diff --git a/src/lib/crypto/builtin/enc_provider/Makefile.in b/src/lib/crypto/builtin/enc_provider/Makefile.in
index 6a7e96f..c87fb05 100644
--- a/src/lib/crypto/builtin/enc_provider/Makefile.in
+++ b/src/lib/crypto/builtin/enc_provider/Makefile.in
@@ -5,15 +5,11 @@ LOCALINCLUDES = -I$(srcdir)/../des \
-I$(srcdir)/../camellia \
-I$(srcdir)/../../krb \
-I$(srcdir)/..
-DEFS=
##DOS##BUILDTOP = ..\..\..\..
##DOS##PREFIXDIR = builtin\enc_provider
##DOS##OBJFILE = ..\..\$(OUTPRE)enc_provider.lst
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
STLIBOBJS= \
des.o \
des3.o \
diff --git a/src/lib/crypto/builtin/hash_provider/Makefile.in b/src/lib/crypto/builtin/hash_provider/Makefile.in
index ad40ef6..37d88d4 100644
--- a/src/lib/crypto/builtin/hash_provider/Makefile.in
+++ b/src/lib/crypto/builtin/hash_provider/Makefile.in
@@ -2,15 +2,11 @@ mydir=lib$(S)crypto$(S)builtin$(S)hash_provider
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb -I$(srcdir)/../md4 \
-I$(srcdir)/../md5 -I$(srcdir)/../sha1
-DEFS=
##DOS##BUILDTOP = ..\..\..\..
##DOS##PREFIXDIR = builtin\hash_provider
##DOS##OBJFILE = ..\..\$(OUTPRE)hash_provider.lst
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
STLIBOBJS= \
hash_crc32.o \
hash_md4.o \
diff --git a/src/lib/crypto/builtin/md4/Makefile.in b/src/lib/crypto/builtin/md4/Makefile.in
index 3dbeb5b..d93f78f 100644
--- a/src/lib/crypto/builtin/md4/Makefile.in
+++ b/src/lib/crypto/builtin/md4/Makefile.in
@@ -1,15 +1,11 @@
mydir=lib$(S)crypto$(S)builtin$(S)md4
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
LOCALINCLUDES = -I$(srcdir)
-DEFS=
##DOS##BUILDTOP = ..\..\..\..
##DOS##PREFIXDIR = builtin\md4
##DOS##OBJFILE = ..\..\$(OUTPRE)md4.lst
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
STLIBOBJS= md4.o
OBJS= $(OUTPRE)md4.$(OBJEXT)
diff --git a/src/lib/crypto/builtin/md5/Makefile.in b/src/lib/crypto/builtin/md5/Makefile.in
index 1ab1ce9..c938da8 100644
--- a/src/lib/crypto/builtin/md5/Makefile.in
+++ b/src/lib/crypto/builtin/md5/Makefile.in
@@ -1,14 +1,10 @@
mydir=lib$(S)crypto$(S)builtin$(S)md5
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-DEFS=
##DOS##BUILDTOP = ..\..\..\..
##DOS##PREFIXDIR = builtin\md5
##DOS##OBJFILE = ..\..\$(OUTPRE)md5.lst
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
STLIBOBJS= md5.o
OBJS= $(OUTPRE)md5.$(OBJEXT)
diff --git a/src/lib/crypto/builtin/sha1/Makefile.in b/src/lib/crypto/builtin/sha1/Makefile.in
index 00e6cb6..339e47c 100644
--- a/src/lib/crypto/builtin/sha1/Makefile.in
+++ b/src/lib/crypto/builtin/sha1/Makefile.in
@@ -1,15 +1,10 @@
mydir=lib$(S)crypto$(S)builtin$(S)sha1
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-DEFS=
##DOS##BUILDTOP = ..\..\..\..
##DOS##PREFIXDIR = builtin\sha1
##DOS##OBJFILE = ..\..\$(OUTPRE)sha1.lst
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
STLIBOBJS= shs.o
OBJS= $(OUTPRE)shs.$(OBJEXT)
diff --git a/src/lib/crypto/builtin/sha2/Makefile.in b/src/lib/crypto/builtin/sha2/Makefile.in
index ffb9b74..7c5e137 100644
--- a/src/lib/crypto/builtin/sha2/Makefile.in
+++ b/src/lib/crypto/builtin/sha2/Makefile.in
@@ -1,15 +1,10 @@
mydir=lib$(S)crypto$(S)builtin$(S)sha2
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-DEFS=
##DOS##BUILDTOP = ..\..\..\..
##DOS##PREFIXDIR = builtin\sha2
##DOS##OBJFILE = ..\..\$(OUTPRE)sha2.lst
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
STLIBOBJS= sha256.o
OBJS= $(OUTPRE)sha256.$(OBJEXT)
diff --git a/src/lib/crypto/crypto_tests/Makefile.in b/src/lib/crypto/crypto_tests/Makefile.in
index 58e1c48..c3ecf2f 100644
--- a/src/lib/crypto/crypto_tests/Makefile.in
+++ b/src/lib/crypto/crypto_tests/Makefile.in
@@ -1,10 +1,6 @@
mydir=lib$(S)crypto$(S)crypto_tests
BUILDTOP=$(REL)..$(S)..$(S)..
LOCALINCLUDES = -I$(srcdir)/../krb -I$(srcdir)/../$(CRYPTO_IMPL)
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
EXTRADEPSRCS=\
$(srcdir)/t_nfold.c \
diff --git a/src/lib/crypto/krb/Makefile.in b/src/lib/crypto/krb/Makefile.in
index 66bcc8a..75ce457 100644
--- a/src/lib/crypto/krb/Makefile.in
+++ b/src/lib/crypto/krb/Makefile.in
@@ -1,18 +1,11 @@
mydir=lib$(S)crypto$(S)krb
BUILDTOP=$(REL)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/../$(CRYPTO_IMPL)
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
+LOCALINCLUDES = -I$(srcdir)/../$(CRYPTO_IMPL)
##DOS##BUILDTOP = ..\..\..
##DOS##PREFIXDIR = krb
##DOS##OBJFILE = ..\$(OUTPRE)krb.lst
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
STLIBOBJS=\
aead.o \
block_size.o \
diff --git a/src/lib/crypto/nss/Makefile.in b/src/lib/crypto/nss/Makefile.in
index bb8b8c2..06d1d76 100644
--- a/src/lib/crypto/nss/Makefile.in
+++ b/src/lib/crypto/nss/Makefile.in
@@ -4,10 +4,6 @@ SUBDIRS=des aes camellia md4 md5 sha1 sha2 enc_provider hash_provider
CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
LOCALINCLUDES = -I$(srcdir)/../krb -I$(srcdir) $(CRYPTO_IMPL_CFLAGS)
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
-
STLIBOBJS=\
hmac.o \
pbkdf2.o \
diff --git a/src/lib/crypto/nss/aes/Makefile.in b/src/lib/crypto/nss/aes/Makefile.in
index 947ad11..ebc3200 100644
--- a/src/lib/crypto/nss/aes/Makefile.in
+++ b/src/lib/crypto/nss/aes/Makefile.in
@@ -1,26 +1,2 @@
-# Nothing here! But we can't remove this directory as the build
-# system currently assumes that all modules have the same directory
-# structure.
-
mydir=lib$(S)crypto$(S)nss$(S)aes
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/../../krb -I$(srcdir)/..
-DEFS=
-
-STLIBOBJS=
-
-OBJS=
-
-SRCS=
-
-
-all-unix:: all-libobjs
-
-includes:: depend
-
-depend:: $(SRCS)
-
-clean-unix:: clean-libobjs
-
- at libobj_frag@
-
diff --git a/src/lib/crypto/nss/camellia/Makefile.in b/src/lib/crypto/nss/camellia/Makefile.in
index 0412271..c703172 100644
--- a/src/lib/crypto/nss/camellia/Makefile.in
+++ b/src/lib/crypto/nss/camellia/Makefile.in
@@ -1,26 +1,2 @@
-# Nothing here! But we can't remove this directory as the build
-# system currently assumes that all modules have the same directory
-# structure.
-
mydir=lib$(S)crypto$(S)nss$(S)camellia
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/../../krb -I$(srcdir)/..
-DEFS=
-
-STLIBOBJS=
-
-OBJS=
-
-SRCS=
-
-
-all-unix:: all-libobjs
-
-includes:: depend
-
-depend:: $(SRCS)
-
-clean-unix:: clean-libobjs
-
- at libobj_frag@
-
diff --git a/src/lib/crypto/nss/des/Makefile.in b/src/lib/crypto/nss/des/Makefile.in
index cdef281..6b240e6 100644
--- a/src/lib/crypto/nss/des/Makefile.in
+++ b/src/lib/crypto/nss/des/Makefile.in
@@ -3,12 +3,6 @@ BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
LOCALINCLUDES = -I$(srcdir)/../../krb -I$(srcdir)/.. $(CRYPTO_IMPL_CFLAGS)
-DEFS=
-
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
STLIBOBJS= des_keys.o
OBJS= $(OUTPRE)des_keys.$(OBJEXT)
diff --git a/src/lib/crypto/nss/enc_provider/Makefile.in b/src/lib/crypto/nss/enc_provider/Makefile.in
index 3657d59..e1d382e 100644
--- a/src/lib/crypto/nss/enc_provider/Makefile.in
+++ b/src/lib/crypto/nss/enc_provider/Makefile.in
@@ -2,10 +2,6 @@ mydir=lib$(S)crypto$(S)nss$(S)enc_provider
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
LOCALINCLUDES = -I$(srcdir)/../../krb -I$(srcdir)/.. $(CRYPTO_IMPL_CFLAGS)
-DEFS=
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
STLIBOBJS= \
enc_gen.o \
diff --git a/src/lib/crypto/nss/hash_provider/Makefile.in b/src/lib/crypto/nss/hash_provider/Makefile.in
index e6b25ca..495309b 100644
--- a/src/lib/crypto/nss/hash_provider/Makefile.in
+++ b/src/lib/crypto/nss/hash_provider/Makefile.in
@@ -4,11 +4,6 @@ CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
LOCALINCLUDES = -I$(srcdir)/../../krb -I$(srcdir)/.. -I$(srcdir)/../md4 \
$(CRYPTO_IMPL_CFLAGS)
-DEFS=
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
STLIBOBJS= \
hash_gen.o \
hash_crc32.o \
diff --git a/src/lib/crypto/nss/md4/Makefile.in b/src/lib/crypto/nss/md4/Makefile.in
index 3927d57..b71c192 100644
--- a/src/lib/crypto/nss/md4/Makefile.in
+++ b/src/lib/crypto/nss/md4/Makefile.in
@@ -1,7 +1,5 @@
mydir=lib$(S)crypto$(S)nss$(S)md4
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES =
-DEFS=
STLIBOBJS= md4.o
@@ -18,4 +16,3 @@ depend:: $(SRCS)
clean-unix:: clean-libobjs
@libobj_frag@
-
diff --git a/src/lib/crypto/nss/md5/Makefile.in b/src/lib/crypto/nss/md5/Makefile.in
index ec72795..e0e3fa5 100644
--- a/src/lib/crypto/nss/md5/Makefile.in
+++ b/src/lib/crypto/nss/md5/Makefile.in
@@ -1,17 +1,5 @@
mydir=lib$(S)crypto$(S)nss$(S)md5
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-DEFS=
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-LOCALINCLUDES =
-
-
-STLIBOBJS=
-
-OBJS=
-
-SRCS=
all-unix:: all-libobjs
diff --git a/src/lib/crypto/nss/sha1/Makefile.in b/src/lib/crypto/nss/sha1/Makefile.in
index 8e7809e..4bcc193 100644
--- a/src/lib/crypto/nss/sha1/Makefile.in
+++ b/src/lib/crypto/nss/sha1/Makefile.in
@@ -1,21 +1,2 @@
mydir=lib$(S)crypto$(S)nss$(S)sha1
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-DEFS=
-LOCALINCLUDES =
-
-STLIBOBJS=
-
-OBJS=
-
-SRCS=
-
-all-unix:: all-libobjs
-
-includes:: depend
-
-depend:: $(SRCS)
-
-clean-unix:: clean-libobjs
-
- at libobj_frag@
-
diff --git a/src/lib/crypto/nss/sha2/Makefile.in b/src/lib/crypto/nss/sha2/Makefile.in
index 89662fa..01e30f3 100644
--- a/src/lib/crypto/nss/sha2/Makefile.in
+++ b/src/lib/crypto/nss/sha2/Makefile.in
@@ -4,18 +4,6 @@
mydir=lib$(S)crypto$(S)nss$(S)aes
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES =
-DEFS=
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
-STLIBOBJS=
-
-OBJS=
-
-SRCS=
-
all-unix:: all-libobjs
diff --git a/src/lib/crypto/openssl/Makefile.in b/src/lib/crypto/openssl/Makefile.in
index c889cbe..c7bff2e 100644
--- a/src/lib/crypto/openssl/Makefile.in
+++ b/src/lib/crypto/openssl/Makefile.in
@@ -2,9 +2,6 @@ mydir=lib$(S)crypto$(S)openssl
BUILDTOP=$(REL)..$(S)..$(S)..
SUBDIRS=camellia des aes md4 md5 sha1 sha2 enc_provider hash_provider
LOCALINCLUDES = -I$(srcdir)/../krb -I$(srcdir)
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
STLIBOBJS=\
hmac.o \
diff --git a/src/lib/crypto/openssl/aes/Makefile.in b/src/lib/crypto/openssl/aes/Makefile.in
index 6df0e0d..22a1019 100644
--- a/src/lib/crypto/openssl/aes/Makefile.in
+++ b/src/lib/crypto/openssl/aes/Makefile.in
@@ -4,21 +4,3 @@
mydir=lib$(S)crypto$(S)openssl$(S)aes
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES=
-DEFS=
-
-STLIBOBJS=
-
-OBJS=
-
-SRCS=
-
-all-unix:: all-libobjs
-
-includes:: depend
-
-depend:: $(SRCS)
-
-clean-unix:: clean-libobjs
-
- at libobj_frag@
diff --git a/src/lib/crypto/openssl/camellia/Makefile.in b/src/lib/crypto/openssl/camellia/Makefile.in
index b805e9f..ce689e6 100644
--- a/src/lib/crypto/openssl/camellia/Makefile.in
+++ b/src/lib/crypto/openssl/camellia/Makefile.in
@@ -1,26 +1,2 @@
-# Nothing here! But we can't remove this directory as the build
-# system currently assumes that all modules have the same directory
-# structure.
-
mydir=lib$(S)crypto$(S)openssl$(S)camellia
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES =
-DEFS=
-
-STLIBOBJS=
-
-OBJS=
-
-SRCS=
-
-
-all-unix:: all-libobjs
-
-includes:: depend
-
-depend:: $(SRCS)
-
-clean-unix:: clean-libobjs
-
- at libobj_frag@
-
diff --git a/src/lib/crypto/openssl/des/Makefile.in b/src/lib/crypto/openssl/des/Makefile.in
index ac113f7..6240a57 100644
--- a/src/lib/crypto/openssl/des/Makefile.in
+++ b/src/lib/crypto/openssl/des/Makefile.in
@@ -1,11 +1,6 @@
mydir=lib$(S)crypto$(S)openssl$(S)des
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
LOCALINCLUDES = -I$(srcdir)/../../krb -I$(srcdir)/..
-DEFS=
-
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
STLIBOBJS= des_keys.o
diff --git a/src/lib/crypto/openssl/enc_provider/Makefile.in b/src/lib/crypto/openssl/enc_provider/Makefile.in
index fd0335f..89a02af 100644
--- a/src/lib/crypto/openssl/enc_provider/Makefile.in
+++ b/src/lib/crypto/openssl/enc_provider/Makefile.in
@@ -1,10 +1,6 @@
mydir=lib$(S)crypto$(S)openssl$(S)enc_provider
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
LOCALINCLUDES = -I$(srcdir)/../../krb -I$(srcdir)/..
-DEFS=
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
STLIBOBJS= \
des.o \
diff --git a/src/lib/crypto/openssl/hash_provider/Makefile.in b/src/lib/crypto/openssl/hash_provider/Makefile.in
index 47dfe72..6471371 100644
--- a/src/lib/crypto/openssl/hash_provider/Makefile.in
+++ b/src/lib/crypto/openssl/hash_provider/Makefile.in
@@ -1,10 +1,6 @@
mydir=lib$(S)crypto$(S)openssl$(S)hash_provider
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
LOCALINCLUDES = -I$(srcdir)/../../krb -I$(srcdir)/..
-DEFS=
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
STLIBOBJS= \
hash_crc32.o \
diff --git a/src/lib/crypto/openssl/md4/Makefile.in b/src/lib/crypto/openssl/md4/Makefile.in
index 0b95690..d2bde76 100644
--- a/src/lib/crypto/openssl/md4/Makefile.in
+++ b/src/lib/crypto/openssl/md4/Makefile.in
@@ -1,21 +1,2 @@
mydir=lib$(S)crypto$(S)openssl$(S)md4
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES =
-DEFS=
-
-STLIBOBJS=
-
-OBJS=
-
-SRCS=
-
-all-unix:: all-libobjs
-
-includes:: depend
-
-depend:: $(SRCS)
-
-clean-unix:: clean-libobjs
-
- at libobj_frag@
-
diff --git a/src/lib/crypto/openssl/md5/Makefile.in b/src/lib/crypto/openssl/md5/Makefile.in
index 4128e98..94d10b9 100644
--- a/src/lib/crypto/openssl/md5/Makefile.in
+++ b/src/lib/crypto/openssl/md5/Makefile.in
@@ -1,20 +1,2 @@
mydir=lib$(S)crypto$(S)openssl$(S)md5
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-DEFS=
-
-STLIBOBJS=
-
-OBJS=
-
-SRCS=
-
-all-unix:: all-libobjs
-
-includes:: depend
-
-depend:: $(SRCS)
-
-clean-unix:: clean-libobjs
-
- at libobj_frag@
-
diff --git a/src/lib/crypto/openssl/sha1/Makefile.in b/src/lib/crypto/openssl/sha1/Makefile.in
index 08fe830..536cc9b 100644
--- a/src/lib/crypto/openssl/sha1/Makefile.in
+++ b/src/lib/crypto/openssl/sha1/Makefile.in
@@ -1,20 +1,2 @@
mydir=lib$(S)crypto$(S)openssl$(S)sha1
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-DEFS=
-
-STLIBOBJS=
-
-OBJS=
-
-SRCS=
-
-all-unix:: all-libobjs
-
-includes:: depend
-
-depend:: $(SRCS)
-
-clean-unix:: clean-libobjs
-
- at libobj_frag@
-
diff --git a/src/lib/crypto/openssl/sha2/Makefile.in b/src/lib/crypto/openssl/sha2/Makefile.in
index 6df0e0d..f68710e 100644
--- a/src/lib/crypto/openssl/sha2/Makefile.in
+++ b/src/lib/crypto/openssl/sha2/Makefile.in
@@ -1,24 +1,2 @@
-# Nothing here! But we can't remove this directory as the build
-# system currently assumes that all modules have the same directory
-# structure.
-
mydir=lib$(S)crypto$(S)openssl$(S)aes
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES=
-DEFS=
-
-STLIBOBJS=
-
-OBJS=
-
-SRCS=
-
-all-unix:: all-libobjs
-
-includes:: depend
-
-depend:: $(SRCS)
-
-clean-unix:: clean-libobjs
-
- at libobj_frag@
diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index 4038343..8d204b5 100644
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -1,7 +1,7 @@
mydir=lib$(S)gssapi
BUILDTOP=$(REL)..$(S)..
SUBDIRS= generic krb5 spnego mechglue
-DEFS=-D_GSS_STATIC_LINK=1
+DEFINES=-D_GSS_STATIC_LINK=1
##DOSLIBNAME=$(OUTPRE)gssapi.lib
##DOSOBJFILELIST=@$(OUTPRE)mechglue.lst @$(OUTPRE)spnego.lst @$(OUTPRE)generic.lst @$(OUTPRE)krb5.lst # @$(OUTPRE)gssapi.lst
@@ -28,8 +28,6 @@ SUBDIROBJLISTS=generic/OBJS.ST mechglue/OBJS.ST krb5/OBJS.ST spnego/OBJS.ST
SHLIB_EXPDEPS=\
$(KRB5_DEPLIB) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) $(COM_ERR_DEPLIB)
SHLIB_EXPLIBS=-lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) $(DL_LIB) $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
RELDIR=gssapi
all-unix:: all-liblinks @MAINT@ verify-calling-conventions-gssapi
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 39e5150..40c6772 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -1,7 +1,6 @@
mydir=lib$(S)gssapi$(S)generic
BUILDTOP=$(REL)..$(S)..$(S)..
LOCALINCLUDES = -I. -I$(srcdir) -I$(srcdir)/..
-DEFS=
##DOS##BUILDTOP = ..\..\..
##DOS##PREFIXDIR=generic
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index 3954e87..1e77ea8 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -1,23 +1,18 @@
mydir=lib$(S)gssapi$(S)krb5
BUILDTOP=$(REL)..$(S)..$(S)..
LOCALINCLUDES = -I. -I$(srcdir) -I$(srcdir)/.. -I../generic -I$(srcdir)/../generic -I../mechglue -I$(srcdir)/../mechglue
-DEFS=-D_GSS_STATIC_LINK=1
+DEFINES=-D_GSS_STATIC_LINK=1
-#PROG_LIBPATH=-L$(TOPLIBD)
-#PROG_RPATH=$(KRB5_LIBDIR)
#MODULE_INSTALL_DIR = $(GSS_MODULE_DIR)
#LIBBASE=mech_krb5
#LIBMAJOR=0
#LIBMINOR=0
-#SO_EXT=.so
#LIBINITFUNC=gss_krb5int_init
#LIBFINIFUNC=gss_krb5int_fini
#STOBJLISTS=../generic/OBJS.ST OBJS.ST
#SUBDIROBJLISTS=../generic/OBJS.ST
#SHLIB_EXPDEPS=$(KRB5_DEPLIB) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) $(COM_ERR_DEPLIB)
#SHLIB_EXPLIBS=-lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) $(DL_LIB) $(LIBS)
-#SHLIB_DIRS=-L$(TOPLIBD)
-#SHLIB_RDIRS=$(KRB5_LIBDIR)
#RELDIR=gssapi/krb5
##DOS##BUILDTOP = ..\..\..
diff --git a/src/lib/gssapi/mechglue/Makefile.in b/src/lib/gssapi/mechglue/Makefile.in
index 9987d15..b85b21d 100644
--- a/src/lib/gssapi/mechglue/Makefile.in
+++ b/src/lib/gssapi/mechglue/Makefile.in
@@ -1,7 +1,7 @@
mydir=lib$(S)gssapi$(S)mechglue
BUILDTOP=$(REL)..$(S)..$(S)..
LOCALINCLUDES = -I. -I$(srcdir) -I$(srcdir)/.. -I../generic -I$(srcdir)/../generic -I../krb5 -I$(srcdir)/../krb5 -I../spnego -I$(srcdir)/../spnego
-DEFS=-D_GSS_STATIC_LINK=1
+DEFINES=-D_GSS_STATIC_LINK=1
##DOSBUILDTOP = ..\..\..
##DOS##PREFIXDIR=mechglue
diff --git a/src/lib/gssapi/spnego/Makefile.in b/src/lib/gssapi/spnego/Makefile.in
index 49f67ab..f323d91 100644
--- a/src/lib/gssapi/spnego/Makefile.in
+++ b/src/lib/gssapi/spnego/Makefile.in
@@ -1,7 +1,7 @@
mydir=lib$(S)gssapi$(S)spnego
BUILDTOP=$(REL)..$(S)..$(S)..
LOCALINCLUDES = -I. -I$(srcdir) -I$(srcdir)/.. -I../generic -I$(srcdir)/../generic -I../mechglue -I$(srcdir)/../mechglue
-DEFS=-D_GSS_STATIC_LINK=1
+DEFINES=-D_GSS_STATIC_LINK=1
##DOS##BUILDTOP = ..\..\..
##DOS##PREFIXDIR=spnego
diff --git a/src/lib/kadm5/Makefile.in b/src/lib/kadm5/Makefile.in
index 9208517..24e1381 100644
--- a/src/lib/kadm5/Makefile.in
+++ b/src/lib/kadm5/Makefile.in
@@ -1,7 +1,6 @@
mydir=lib$(S)kadm5
BUILDTOP=$(REL)..$(S)..
SUBDIRS = clnt srv unit-test
-DEFS=
##DOSBUILDTOP = ..\..
diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in
index 3588a86..28d66ae 100644
--- a/src/lib/kadm5/clnt/Makefile.in
+++ b/src/lib/kadm5/clnt/Makefile.in
@@ -1,7 +1,6 @@
mydir=lib$(S)kadm5$(S)clnt
BUILDTOP=$(REL)..$(S)..$(S)..
LOCALINCLUDES = -I$(BUILDTOP)/include/kadm5
-DEFS=
LIBBASE=kadm5clnt_mit
LIBMAJOR=9
@@ -14,8 +13,6 @@ SHLIB_EXPDEPS=\
$(TOPLIBD)/libk5crypto$(SHLIBEXT) \
$(COM_ERR_DEPLIB) $(SUPPORT_LIBDEP)
SHLIB_EXPLIBS=-lgssrpc -lgssapi_krb5 -lkrb5 -lk5crypto $(SUPPORT_LIB) -lcom_err $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
RELDIR=kadm5/clnt
##DOSBUILDTOP = ..\..\..
diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in
index ccf9ec3..26c5237 100644
--- a/src/lib/kadm5/srv/Makefile.in
+++ b/src/lib/kadm5/srv/Makefile.in
@@ -4,7 +4,6 @@ LOCALINCLUDES = -I$(BUILDTOP)/include/kadm5 \
-I$(top_srcdir)/lib/gssapi/krb5 -I$(top_srcdir)/lib/gssapi/generic \
-I$(BUILDTOP)/lib/gssapi/krb5 -I$(BUILDTOP)/lib/gssapi/generic
DEFINES = @HESIOD_DEFS@
-DEFS=
##DOSBUILDTOP = ..\..\..
##DOSLIBNAME = libkadm5srv.lib
@@ -23,8 +22,6 @@ SHLIB_EXPDEPS=\
$(COM_ERR_DEPLIB) $(SUPPORT_LIBDEP)
SHLIB_EXPLIBS = -lgssrpc -lgssapi_krb5 -lkdb5 $(KDB5_DB_LIB) \
-lkrb5 -lk5crypto $(SUPPORT_LIB) -lcom_err @GEN_LIB@ $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
RELDIR=kadm5/srv
SRCS = $(srcdir)/pwqual.c \
diff --git a/src/lib/kadm5/unit-test/Makefile.in b/src/lib/kadm5/unit-test/Makefile.in
index f8d7b78..49fc3ae 100644
--- a/src/lib/kadm5/unit-test/Makefile.in
+++ b/src/lib/kadm5/unit-test/Makefile.in
@@ -1,10 +1,6 @@
mydir=lib$(S)kadm5$(S)unit-test
BUILDTOP=$(REL)..$(S)..$(S)..
-DEFINES =
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
-DEFS=
SRCS= init-test.c destroy-test.c handle-test.c iter-test.c setkey-test.c \
randkey-test.c lock-test.c
diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in
index 42b6b85..826b1de 100644
--- a/src/lib/kdb/Makefile.in
+++ b/src/lib/kdb/Makefile.in
@@ -1,13 +1,7 @@
mydir=lib$(S)kdb
BUILDTOP=$(REL)..$(S)..
-RUN_SETUP = @KRB5_RUN_ENV@
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-CFLAGS=@CFLAGS@ -DKDB5_USE_LIB_KDB_DB2
+DEFINES= -DKDB5_USE_LIB_KDB_DB2
LOCALINCLUDES= -I.
-DEFS=
# Keep LIBMAJOR in sync with KRB5_KDB_API_VERSION in include/kdb.h.
LIBBASE=kdb5
@@ -23,8 +17,6 @@ SHLIB_EXPDEPS = \
$(TOPLIBD)/libgssrpc$(SHLIBEXT) \
$(TOPLIBD)/libkrb5$(SHLIBEXT)
SHLIB_EXPLIBS=-lgssrpc -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) $(DL_LIB) $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
adb_err.$(OBJEXT): adb_err.c
adb_err.c adb_err.h: $(srcdir)/adb_err.et
@@ -41,7 +33,6 @@ SRCS= \
$(srcdir)/kdb_log.c \
$(srcdir)/keytab.c
-STOBJLISTS=OBJS.ST
STLIBOBJS= \
kdb5.o \
encrypt_key.o \
diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index a63270a..d9cddc1 100644
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -3,7 +3,7 @@ BUILDTOP=$(REL)..$(S)..
LOCALINCLUDES = -I$(srcdir)/ccache -I$(srcdir)/keytab -I$(srcdir)/rcache -I$(srcdir)/os -I$(srcdir)/unicode
SUBDIRS= error_tables asn.1 ccache keytab krb os rcache unicode
WINSUBDIRS= $(SUBDIRS) posix
-DEFS=-DLOCALEDIR=\"$(KRB5_LOCALEDIR)\"
+DEFINES=-DLOCALEDIR=\"$(KRB5_LOCALEDIR)\"
##DOSBUILDTOP = ..\..
##DOSLIBNAME=$(OUTPRE)krb5.lib
@@ -57,8 +57,6 @@ SHLIB_EXPDEPS = \
$(TOPLIBD)/libk5crypto$(SHLIBEXT) \
$(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB)
SHLIB_EXPLIBS=-lk5crypto -lcom_err $(SUPPORT_LIB) @GEN_LIB@ $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
all-unix:: all-liblinks
diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in
index cbef50e..3028085 100644
--- a/src/lib/krb5/asn.1/Makefile.in
+++ b/src/lib/krb5/asn.1/Makefile.in
@@ -1,6 +1,5 @@
mydir=lib$(S)krb5$(S)asn.1
BUILDTOP=$(REL)..$(S)..$(S)..
-DEFS=
##DOS##BUILDTOP = ..\..\..
##DOS##PREFIXDIR=asn.1
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index f64226b..1b62e81 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -2,12 +2,7 @@ mydir=lib$(S)krb5$(S)ccache
BUILDTOP=$(REL)..$(S)..$(S)..
SUBDIRS = # ccapi
WINSUBDIRS = ccapi
-DEFS=
-##WIN32##DEFS=$(DEFS) -DUSE_CCAPI -DUSE_CCAPI_V3
-
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
+##WIN32##DEFINES = -DUSE_CCAPI -DUSE_CCAPI_V3
LOCALINCLUDES = -I$(srcdir)$(S)ccapi $(WIN_INCLUDES)
diff --git a/src/lib/krb5/ccache/ccapi/Makefile.in b/src/lib/krb5/ccache/ccapi/Makefile.in
index 29f3b92..cca858c 100644
--- a/src/lib/krb5/ccache/ccapi/Makefile.in
+++ b/src/lib/krb5/ccache/ccapi/Makefile.in
@@ -1,7 +1,7 @@
mydir=lib$(S)krb5$(S)ccache$(S)ccapi
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
LOCALINCLUDES = $(WIN_INCLUDES)
-DEFS= -DUSE_CCAPI -DUSE_CCAPI_V3
+DEFINES= -DUSE_CCAPI -DUSE_CCAPI_V3
##DOS##WIN_INCLUDES = -I$(top_srcdir)\windows\lib
diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in
index eb890d1..2f86dea 100644
--- a/src/lib/krb5/error_tables/Makefile.in
+++ b/src/lib/krb5/error_tables/Makefile.in
@@ -1,6 +1,5 @@
mydir=lib$(S)krb5$(S)error_tables
BUILDTOP=$(REL)..$(S)..$(S)..
-DEFS=
##DOS##BUILDTOP = ..\..\..
##DOS##PREFIXDIR=error_tables
diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in
index ccb4a6a..d586ee0 100644
--- a/src/lib/krb5/keytab/Makefile.in
+++ b/src/lib/krb5/keytab/Makefile.in
@@ -1,10 +1,5 @@
mydir=lib$(S)krb5$(S)keytab
BUILDTOP=$(REL)..$(S)..$(S)..
-DEFS=
-
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
##DOS##BUILDTOP = ..\..\..
##DOS##PREFIXDIR=keytab
diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index 537d717..d5db274 100644
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -1,10 +1,7 @@
mydir=lib$(S)krb5$(S)krb
BUILDTOP=$(REL)..$(S)..$(S)..
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
LOCALINCLUDES = -I$(srcdir)/../os -I$(top_srcdir)
-DEFS=-DLIBDIR=\"$(KRB5_LIBDIR)\" -DDYNOBJEXT=\"$(DYNOBJEXT)\"
+DEFINES=-DLIBDIR=\"$(KRB5_LIBDIR)\" -DDYNOBJEXT=\"$(DYNOBJEXT)\"
##DOS##BUILDTOP = ..\..\..
##DOS##PREFIXDIR=krb
diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in
index 6a09619..0353a84 100644
--- a/src/lib/krb5/os/Makefile.in
+++ b/src/lib/krb5/os/Makefile.in
@@ -1,9 +1,5 @@
mydir=lib$(S)krb5$(S)os
BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
DEFINES=-DLIBDIR=\"$(KRB5_LIBDIR)\" -DBINDIR=\"$(CLIENT_BINDIR)\" \
-DSBINDIR=\"$(ADMIN_BINDIR)\"
LOCALINCLUDES=-I$(top_srcdir)/util/profile
@@ -195,7 +191,7 @@ check-unix:: check-unix-stdconf check-unix-locate check-unix-trace \
check-unix-stdconf:: t_std_conf
KRB5_CONFIG=$(srcdir)/td_krb5.conf ; export KRB5_CONFIG ;\
- $(KRB5_RUN_ENV) $(VALGRIND) ./t_std_conf -d -s NEW.DEFAULT.REALM -d \
+ $(RUN_SETUP) $(VALGRIND) ./t_std_conf -d -s NEW.DEFAULT.REALM -d \
-D DEFAULT_REALM.TST -r bad.idea -r itar.bad.idea \
-r really.BAD.IDEA. -r clipper.bad.idea -r KeYEsCrOW.BaD.IDea \
-r pgp.good.idea -r no_domain > test.out
@@ -215,7 +211,7 @@ check-unix-locate:: t_locate_kdc
if $(DIG) $(SRVNAME) srv | grep -i $(DIGPAT) || \
$(NSLOOKUP) -q=srv $(SRVNAME) | grep -i $(NSPAT); then \
KRB5_CONFIG=$(srcdir)/td_krb5.conf ; export KRB5_CONFIG ;\
- $(KRB5_RUN_ENV) $(VALGRIND) ./t_locate_kdc $(LOCREALM); \
+ $(RUN_SETUP) $(VALGRIND) ./t_locate_kdc $(LOCREALM); \
else \
echo '*** WARNING: skipped t_locate_kdc test: known DNS name not found'; \
fi; \
@@ -226,15 +222,15 @@ check-unix-locate:: t_locate_kdc
check-unix-trace:: t_trace
rm -f t_trace.out
KRB5_TRACE=t_trace.out ; export KRB5_TRACE ; \
- $(KRB5_RUN_ENV) $(VALGRIND) ./t_trace
+ $(RUN_SETUP) $(VALGRIND) ./t_trace
sed -e 's/^[^:]*: //' t_trace.out | cmp - $(srcdir)/t_trace.ref
rm -f t_trace.out
check-unix-expand:: t_expand_path
- $(KRB5_RUN_ENV) $(VALGRIND) ./t_expand_path '%{null}' ''
- $(KRB5_RUN_ENV) $(VALGRIND) ./t_expand_path ' %{BINDIR}%{LIBDIR} ' \
+ $(RUN_SETUP) $(VALGRIND) ./t_expand_path '%{null}' ''
+ $(RUN_SETUP) $(VALGRIND) ./t_expand_path ' %{BINDIR}%{LIBDIR} ' \
' $(CLIENT_BINDIR)$(KRB5_LIBDIR) '
- $(KRB5_RUN_ENV) $(VALGRIND) ./t_expand_path \
+ $(RUN_SETUP) $(VALGRIND) ./t_expand_path \
'the %{animal}%{s} on the %{place}%{s}' \
'the frogs on the pads'
diff --git a/src/lib/krb5/posix/Makefile.in b/src/lib/krb5/posix/Makefile.in
index 0d835a9..38b399a 100644
--- a/src/lib/krb5/posix/Makefile.in
+++ b/src/lib/krb5/posix/Makefile.in
@@ -1,6 +1,5 @@
mydir=posix
BUILDTOP=$(REL)..$(S)..$(S)..
-DEFS=
##DOS##BUILDTOP = ..\..\..
##DOS##PREFIXDIR=posix
diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in
index 83e7096..b6095cd 100644
--- a/src/lib/krb5/rcache/Makefile.in
+++ b/src/lib/krb5/rcache/Makefile.in
@@ -1,8 +1,5 @@
mydir=lib$(S)krb5$(S)rcache
BUILDTOP=$(REL)..$(S)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
##DOS##BUILDTOP = ..\..\..
##DOS##PREFIXDIR=rcache
diff --git a/src/lib/krb5/unicode/Makefile.in b/src/lib/krb5/unicode/Makefile.in
index 63e08c9..9a4fb97 100644
--- a/src/lib/krb5/unicode/Makefile.in
+++ b/src/lib/krb5/unicode/Makefile.in
@@ -1,11 +1,5 @@
mydir=lib$(S)krb5$(S)unicode
BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
-DEFINES=-DLIBDIR=\"$(KRB5_LIBDIR)\"
-LOCALINCLUDES=
##DOS##BUILDTOP = ..\..\..
##DOS##PREFIXDIR=unicode
diff --git a/src/lib/rpc/Makefile.in b/src/lib/rpc/Makefile.in
index dc142ba..745d22d 100644
--- a/src/lib/rpc/Makefile.in
+++ b/src/lib/rpc/Makefile.in
@@ -1,7 +1,6 @@
mydir=lib$(S)rpc
BUILDTOP=$(REL)..$(S)..
DEFINES = -DGSSAPI_KRB5 -DDEBUG_GSSAPI=0 -DGSSRPC__IMPL
-DEFS=
SUBDIRS=unit-test
@@ -11,15 +10,12 @@ SUBDIRS=unit-test
LIBBASE=gssrpc
LIBMAJOR=4
LIBMINOR=1
-STOBJLISTS=OBJS.ST
SHLIB_EXPDEPS= \
$(TOPLIBD)/libgssapi_krb5$(SHLIBEXT) \
$(TOPLIBD)/libkrb5$(SHLIBEXT) \
$(TOPLIBD)/libk5crypto$(SHLIBEXT) \
$(COM_ERR_DEPLIB)
SHLIB_EXPLIBS=-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
RELDIR=rpc
SRCS = $(srcdir)/auth_none.c \
diff --git a/src/lib/rpc/unit-test/Makefile.in b/src/lib/rpc/unit-test/Makefile.in
index 0642e53..b72487c 100644
--- a/src/lib/rpc/unit-test/Makefile.in
+++ b/src/lib/rpc/unit-test/Makefile.in
@@ -1,9 +1,5 @@
mydir=lib$(S)rpc$(S)unit-test
BUILDTOP=$(REL)..$(S)..$(S)..
-LOCALINCLUDES = -I.
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
OBJS= client.o rpc_test_clnt.o rpc_test_svc.o server.o
SRCS= client.c rpc_test_clnt.c rpc_test_svc.c server.c
diff --git a/src/plugins/authdata/greet/Makefile.in b/src/plugins/authdata/greet/Makefile.in
index ce70925..f204e2f 100644
--- a/src/plugins/authdata/greet/Makefile.in
+++ b/src/plugins/authdata/greet/Makefile.in
@@ -1,26 +1,15 @@
mydir=plugins$(S)authdata$(S)greet
BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
MODULE_INSTALL_DIR = $(KRB5_AD_MODULE_DIR)
-DEFS=@DEFS@
-
-LOCALINCLUDES = -I../../../include/krb5
LIBBASE=greet
LIBMAJOR=0
LIBMINOR=0
-SO_EXT=.so
#RELDIR=../plugins/preauth/wpse
# Depends on nothing
SHLIB_EXPDEPS =
SHLIB_EXPLIBS=
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-STOBJLISTS=OBJS.ST
STLIBOBJS= greet_auth.o
SRCS= greet_auth.c
@@ -29,9 +18,6 @@ all-unix:: all-libs
install-unix:: install-libs
clean-unix:: clean-libs clean-libobjs
-clean::
- $(RM) lib$(LIBBASE)$(SO_EXT)
-
@libnover_frag@
@libobj_frag@
diff --git a/src/plugins/authdata/greet_client/Makefile.in b/src/plugins/authdata/greet_client/Makefile.in
index 74e4bf4..7f7277b 100644
--- a/src/plugins/authdata/greet_client/Makefile.in
+++ b/src/plugins/authdata/greet_client/Makefile.in
@@ -1,25 +1,13 @@
mydir=plugins$(S)authdata$(S)greet_client
BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
MODULE_INSTALL_DIR = $(KRB5_AD_MODULE_DIR)
-DEFS=@DEFS@
-
-LOCALINCLUDES = -I../../../include/krb5
LIBBASE=greet_client
LIBMAJOR=0
LIBMINOR=0
-SO_EXT=.so
SHLIB_EXPDEPS = $(TOPLIBD)/libk5crypto$(SHLIBEXT) \
$(TOPLIBD)/libkrb5$(SHLIBEXT)
SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto $(SUPPORT_LIB) $(LIBS)
-
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-STOBJLISTS=OBJS.ST
STLIBOBJS= greet.o
SRCS= greet.c
@@ -28,9 +16,6 @@ all-unix:: all-libs
install-unix:: install-libs
clean-unix:: clean-libs clean-libobjs
-clean::
- $(RM) lib$(LIBBASE)$(SO_EXT)
-
@libnover_frag@
@libobj_frag@
diff --git a/src/plugins/authdata/greet_server/Makefile.in b/src/plugins/authdata/greet_server/Makefile.in
index 40b1856..598ee1f 100644
--- a/src/plugins/authdata/greet_server/Makefile.in
+++ b/src/plugins/authdata/greet_server/Makefile.in
@@ -1,25 +1,14 @@
mydir=plugins$(S)authdata$(S)greet_server
BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
MODULE_INSTALL_DIR = $(KRB5_AD_MODULE_DIR)
-DEFS=@DEFS@
-
-LOCALINCLUDES = -I../../../include/krb5
LIBBASE=greet_server
LIBMAJOR=1
LIBMINOR=0
-SO_EXT=.so
SHLIB_EXPDEPS = $(TOPLIBD)/libk5crypto$(SHLIBEXT) \
$(TOPLIBD)/libkrb5$(SHLIBEXT)
SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto $(SUPPORT_LIB) $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-STOBJLISTS=OBJS.ST
STLIBOBJS= greet_auth.o
SRCS= greet_auth.c
@@ -28,9 +17,6 @@ all-unix:: all-libs
install-unix:: install-libs
clean-unix:: clean-libs clean-libobjs
-clean::
- $(RM) lib$(LIBBASE)$(SO_EXT)
-
@libnover_frag@
@libobj_frag@
diff --git a/src/plugins/kadm5_hook/test/Makefile.in b/src/plugins/kadm5_hook/test/Makefile.in
index 17ca242..617371d 100644
--- a/src/plugins/kadm5_hook/test/Makefile.in
+++ b/src/plugins/kadm5_hook/test/Makefile.in
@@ -1,17 +1,9 @@
mydir=plugins$(S)kadm5_hook$(S)test
BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=@DEFS@
-
-LOCALINCLUDES = -I../../../include/krb5 -I.
LIBBASE=kadm5_hook_test
LIBMAJOR=0
LIBMINOR=0
-SO_EXT=.so
RELDIR=../plugins/kadm5_hook/test
# Depends on libk5crypto and libkrb5
SHLIB_EXPDEPS = \
@@ -19,9 +11,6 @@ SHLIB_EXPDEPS = \
$(TOPLIBD)/libkrb5$(SHLIBEXT)
SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto $(SUPPORT_LIB) $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-STOBJLISTS=OBJS.ST
STLIBOBJS=main.o
SRCS= $(srcdir)/main.c
@@ -30,8 +19,5 @@ all-unix:: all-libs
install-unix::
clean-unix:: clean-libs clean-libobjs
-clean::
- $(RM) lib$(LIBBASE)$(SO_EXT)
-
@libnover_frag@
@libobj_frag@
diff --git a/src/plugins/kdb/db2/Makefile.in b/src/plugins/kdb/db2/Makefile.in
index 6dd9e2e..dac3275 100644
--- a/src/plugins/kdb/db2/Makefile.in
+++ b/src/plugins/kdb/db2/Makefile.in
@@ -1,11 +1,6 @@
mydir=plugins$(S)kdb$(S)db2
BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
MODULE_INSTALL_DIR = $(KRB5_DB_MODULE_DIR)
-DEFS=
SUBDIRS= $(SUBDIRS- at DB_VERSION@)
SUBDIRS-sys=
@@ -29,7 +24,6 @@ DB_DEPLIB-sys =
LIBBASE=db2
LIBMAJOR=0
LIBMINOR=0
-SO_EXT=.so
RELDIR=../plugins/kdb/db2
# Depends on libk5crypto and libkrb5
# Also on gssrpc, for xdr stuff.
@@ -39,9 +33,6 @@ SHLIB_EXPDEPS = \
$(TOPLIBD)/libkrb5$(SHLIBEXT)
SHLIB_EXPLIBS= $(GSSRPC_LIBS) -lkrb5 -lcom_err -lk5crypto $(KDB5_DB_LIB) $(KADMSRV_LIBS) $(SUPPORT_LIB) $(LIBS) @DB_EXTRA_LIBS@
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-
DBDIR = libdb2
DBOBJLISTS = $(DBOBJLISTS- at DB_VERSION@)
DBOBJLISTS-sys =
@@ -74,11 +65,8 @@ clean-unix:: clean-liblinks clean-libs clean-libobjs
$(DB_DEPS) $(DBOBJLISTS-k5) $(DBSHOBJLISTS): all-recurse
-#lib$(LIBBASE)$(SO_EXT): db2_exp.o
-# $(CC) -shared -o $@ -L$(TOPLIBD) $^ -ldb $(SHLIB_EXPLIBS)
-
clean::
- $(RM) lib$(LIBBASE)$(SO_EXT) db2_exp.o .depend-verify-db
+ $(RM) .depend-verify-db
@libnover_frag@
@libobj_frag@
diff --git a/src/plugins/kdb/db2/libdb2/Makefile.in b/src/plugins/kdb/db2/libdb2/Makefile.in
index d2df68c..0de98a9 100644
--- a/src/plugins/kdb/db2/libdb2/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/Makefile.in
@@ -15,8 +15,6 @@ HDRS = $(HDRDIR)/db.h $(HDRDIR)/db-config.h
SHLIB_EXPDEPS=$(SUPPORT_DEPLIB)
SHLIB_EXPLIBS=$(SUPPORT_LIB) $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
all-unix:: includes all-libs
all-prerecurse depend-prerecurse: $(HDRS)
diff --git a/src/plugins/kdb/db2/libdb2/test/Makefile.in b/src/plugins/kdb/db2/libdb2/test/Makefile.in
index 854d50d..24adcbe 100644
--- a/src/plugins/kdb/db2/libdb2/test/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/test/Makefile.in
@@ -8,9 +8,6 @@ LOCALINCLUDES= -I. -I$(srcdir)/../include -I../include -I$(srcdir)/../mpool \
-I$(srcdir)/../btree -I$(srcdir)/../hash -I$(srcdir)/../db
PROG_LIBPATH=-L.. -L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
-KRB5_RUN_ENV= @KRB5_RUN_ENV@
DB_LIB = -ldb
DB_DEPLIB = ../libdb$(DEPLIBEXT)
@@ -21,7 +18,7 @@ dbtest: dbtest.o $(DB_DEPLIB)
$(CC_LINK) -o $@ dbtest.o $(STRERROR_OBJ) $(DB_LIB)
check:: dbtest
- $(KRB5_RUN_ENV) srcdir=$(srcdir) TMPDIR=$(TMPDIR) $(VALGRIND) $(FCTSH) $(srcdir)/run.test
+ $(RUN_SETUP) srcdir=$(srcdir) TMPDIR=$(TMPDIR) $(VALGRIND) $(FCTSH) $(srcdir)/run.test
bttest.o: $(srcdir)/btree.tests/main.c
$(CC) $(ALL_CFLAGS) -c $(srcdir)/btree.tests/main.c -o $@
diff --git a/src/plugins/kdb/hdb/Makefile.in b/src/plugins/kdb/hdb/Makefile.in
index 12ec6fd..bf52f10 100644
--- a/src/plugins/kdb/hdb/Makefile.in
+++ b/src/plugins/kdb/hdb/Makefile.in
@@ -1,11 +1,6 @@
mydir=plugins$(S)kdb$(S)hdb
BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
MODULE_INSTALL_DIR = $(KRB5_DB_MODULE_DIR)
-DEFS=
DB_VERSION = @DB_VERSION@
LOCALINCLUDES = -I../../../lib/kdb -I$(srcdir)/../../../lib/kdb
@@ -14,7 +9,6 @@ DEFINES = -DPLUGIN -DSHLIBEXT=\"$(SHLIBEXT)\"
LIBBASE=hdb
LIBMAJOR=0
LIBMINOR=0
-SO_EXT=.so
RELDIR=../plugins/kdb/hdb
# Depends on libk5crypto and libkrb5
# Also on gssrpc, for xdr stuff.
@@ -25,15 +19,11 @@ SHLIB_EXPDEPS = \
$(TOPLIBD)/libkrb5$(SHLIBEXT)
SHLIB_EXPLIBS= $(GSSRPC_LIBS) -lkdb5 -lkrb5 -lcom_err -lk5crypto $(KDB5_DB_LIB) $(SUPPORT_LIB) $(LIBS) @DB_EXTRA_LIBS@
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-
SRCS= \
$(srcdir)/kdb_hdb.c \
$(srcdir)/kdb_marshal.c \
$(srcdir)/kdb_windc.c
-STOBJLISTS=OBJS.ST $(DBOBJLISTS)
STLIBOBJS= \
kdb_hdb.o \
kdb_marshal.o \
@@ -43,11 +33,6 @@ all-unix:: all-liblinks
install-unix:: install-libs
clean-unix:: clean-liblinks clean-libs clean-libobjs
-$(DB_DEPS) $(DBOBJLISTS-k5) $(DBSHOBJLISTS): all-recurse
-
-clean::
- $(RM) lib$(LIBBASE)$(SO_EXT)
-
@libnover_frag@
@libobj_frag@
diff --git a/src/plugins/kdb/ldap/Makefile.in b/src/plugins/kdb/ldap/Makefile.in
index 36a03e2..3dd4ba6 100644
--- a/src/plugins/kdb/ldap/Makefile.in
+++ b/src/plugins/kdb/ldap/Makefile.in
@@ -1,10 +1,5 @@
mydir=plugins$(S)kdb$(S)ldap
BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS =
MODULE_INSTALL_DIR = $(KRB5_DB_MODULE_DIR)
SUBDIRS= libkdb_ldap
@@ -15,7 +10,6 @@ LOCALINCLUDES = -I../../../lib/kdb -I$(srcdir)/../../../lib/kdb \
LIBBASE=kldap
LIBMAJOR=0
LIBMINOR=0
-SO_EXT=.so
RELDIR=../plugins/kdb/ldap
# Depends on libk5crypto and libkrb5
# Also on gssrpc, for xdr stuff.
@@ -26,15 +20,11 @@ SHLIB_EXPDEPS = \
$(TOPLIBD)/libkrb5$(SHLIBEXT) \
$(TOPLIBD)/lib$(SUPPORT_LIBNAME)$(SHLIBEXT)
SHLIB_EXPLIBS= -lkdb_ldap $(GSSRPC_LIBS) -lkrb5 -lcom_err -lk5crypto -lkrb5support $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
SRCS= $(srcdir)/ldap_exp.c
$(TOPLIBD)/libkdb_ldap$(SHLIBEXT) : all-recurse
-
-STOBJLISTS=OBJS.ST
STLIBOBJS= ldap_exp.o
all-unix:: all-liblinks
diff --git a/src/plugins/kdb/ldap/ldap_util/Makefile.in b/src/plugins/kdb/ldap/ldap_util/Makefile.in
index 73a4c67..b9ea339 100644
--- a/src/plugins/kdb/ldap/ldap_util/Makefile.in
+++ b/src/plugins/kdb/ldap/ldap_util/Makefile.in
@@ -1,10 +1,7 @@
mydir=plugins$(S)kdb$(S)ldap$(S)ldap_util
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
DEFINES = -DKDB4_DISABLE
-DEFS=
LOCALINCLUDES = -I. -I$(srcdir)/../libkdb_ldap -I$(top_srcdir)/lib/kdb
-PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
-PROG_RPATH=$(KRB5_LIBDIR)
#KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
KDB_DEP_LIB=$(DL_LIB) -lkdb_ldap $(THREAD_LINKOPTS)
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in b/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in
index fd65da8..d302cf2 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in
+++ b/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in
@@ -1,9 +1,5 @@
mydir=plugins$(S)kdb$(S)ldap$(S)libkdb_ldap
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
# Lots of ugliness here because of duplicated symbol names.
# Can I just punt the duplicates and import from libkdb5, or
# is keeping them separate important?
@@ -12,7 +8,6 @@ DEFINES = \
-Dkrb5_dbe_lookup_tl_data=kdb_ldap_dbe_lookup_tl_data \
-Dkrb5_dbe_update_last_pwd_change=kdb_ldap_dbe_update_last_pwd_change \
-Dkrb5_dbe_update_tl_data=kdb_ldap_dbe_update_tl_data
-DEFS=
LOCALINCLUDES = -I$(top_srcdir)/lib/kdb -I$(top_srcdir)/lib/krb5/asn.1
@@ -28,8 +23,6 @@ SHLIB_EXPDEPS = \
$(SUPPORT_DEPLIB) \
$(TOPLIBD)/libkrb5$(SHLIBEXT)
SHLIB_EXPLIBS= $(KADMSRV_LIBS) -lkrb5 -lk5crypto $(COM_ERR_LIB) $(SUPPORT_LIB) $(LDAP_LIBS) $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
LIBINITFUNC= kldap_init_fn
LIBFINIFUNC=
@@ -51,7 +44,6 @@ SRCS= $(srcdir)/kdb_ldap.c \
$(srcdir)/ldap_err.c \
$(srcdir)/lockout.c \
-STOBJLISTS=OBJS.ST
STLIBOBJS= kdb_ldap.o \
kdb_ldap_conn.o \
ldap_realm.o \
diff --git a/src/plugins/localauth/test/Makefile.in b/src/plugins/localauth/test/Makefile.in
index fd1d656..c509f83 100644
--- a/src/plugins/localauth/test/Makefile.in
+++ b/src/plugins/localauth/test/Makefile.in
@@ -1,19 +1,13 @@
mydir=plugins$(S)localauth$(S)test
BUILDTOP=$(REL)..$(S)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
LIBBASE=localauth_test
LIBMAJOR=0
LIBMINOR=0
-SO_EXT=.so
RELDIR=../plugins/localauth/test
SHLIB_EXPDEPS=$(SUPPORT_DEPLIB)
SHLIB_EXPLIBS=$(SUPPORT_LIB) $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-STOBJLISTS=OBJS.ST
STLIBOBJS=main.o
SRCS=$(srcdir)/main.c
@@ -22,8 +16,5 @@ all-unix:: all-libs
install-unix::
clean-unix:: clean-libs clean-libobjs
-clean::
- $(RM) lib$(LIBBASE)$(SO_EXT)
-
@libnover_frag@
@libobj_frag@
diff --git a/src/plugins/locate/python/Makefile.in b/src/plugins/locate/python/Makefile.in
index 5b54840..38bed86 100644
--- a/src/plugins/locate/python/Makefile.in
+++ b/src/plugins/locate/python/Makefile.in
@@ -4,19 +4,14 @@ BUILDTOP=$(REL)..$(S)..$(S)..
LIBBASE=python
LIBMAJOR=0
LIBMINOR=0
-SO_EXT=.so
RELDIR=../plugins/locate/python
MODULE_INSTALL_DIR = $(KRB5_LIBKRB5_MODULE_DIR)
SHLIB_EXPDEPS= $(KRB5_DEPLIB) $(SUPPORT_DEPLIB)
SHLIB_EXPLIBS= @PYTHON_LIB@ $(KRB5_LIB) $(SUPPORT_LIB)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-
SRCS= \
$(srcdir)/py-locate.c
-STOBJLISTS=OBJS.ST
STLIBOBJS= py-locate.o
all-unix:: all-liblinks
diff --git a/src/plugins/preauth/cksum_body/Makefile.in b/src/plugins/preauth/cksum_body/Makefile.in
index 82c5a7b..0db924e 100644
--- a/src/plugins/preauth/cksum_body/Makefile.in
+++ b/src/plugins/preauth/cksum_body/Makefile.in
@@ -1,18 +1,10 @@
mydir=plugins$(S)preauth$(S)cksum_body
BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
MODULE_INSTALL_DIR = $(KRB5_PA_MODULE_DIR)
-DEFS=@DEFS@
-
-LOCALINCLUDES = -I../../../include/krb5 -I.
LIBBASE=cksum_body
LIBMAJOR=0
LIBMINOR=0
-SO_EXT=.so
RELDIR=../plugins/preauth/cksum_body
# Depends on libk5crypto and libkrb5
SHLIB_EXPDEPS = \
@@ -20,9 +12,6 @@ SHLIB_EXPDEPS = \
$(TOPLIBD)/libkrb5$(SHLIBEXT)
SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto $(SUPPORT_LIB) $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-STOBJLISTS=OBJS.ST
STLIBOBJS=cksum_body_main.o
SRCS= $(srcdir)/cksum_body_main.c
@@ -31,9 +20,6 @@ all-unix:: $(LIBBASE)$(SO_EXT)
install-unix:: install-libs
clean-unix:: clean-libs clean-libobjs
-clean::
- $(RM) lib$(LIBBASE)$(SO_EXT)
-
@libnover_frag@
@libobj_frag@
diff --git a/src/plugins/preauth/pkinit/Makefile.in b/src/plugins/preauth/pkinit/Makefile.in
index 1acb83e..32d010f 100644
--- a/src/plugins/preauth/pkinit/Makefile.in
+++ b/src/plugins/preauth/pkinit/Makefile.in
@@ -1,19 +1,11 @@
mydir=plugins$(S)preauth$(S)pkinit
BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
MODULE_INSTALL_DIR = $(KRB5_PA_MODULE_DIR)
-DEFS=@DEFS@
-
-LOCALINCLUDES = -I../../../include/krb5 -I. $(PKINIT_CRYPTO_IMPL_CFLAGS)
-RUN_SETUP = @KRB5_RUN_ENV@
+LOCALINCLUDES = $(PKINIT_CRYPTO_IMPL_CFLAGS)
LIBBASE=pkinit
LIBMAJOR=0
LIBMINOR=0
-SO_EXT=.so
RELDIR=../plugins/preauth/pkinit
# Depends on libk5crypto and libkrb5
SHLIB_EXPDEPS = \
@@ -22,9 +14,6 @@ SHLIB_EXPDEPS = \
SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto $(PKINIT_CRYPTO_IMPL_LIBS) $(DL_LIB) $(SUPPORT_LIB) $(LIBS)
DEFINES=-DPKINIT_DYNOBJEXT=\""$(PKINIT_DYNOBJEXT)"\"
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-STOBJLISTS=OBJS.ST
STLIBOBJS= \
pkinit_accessor.o \
pkinit_srv.o \
@@ -53,7 +42,6 @@ install-unix:: install-libs
clean-unix:: clean-liblinks clean-libs clean-libobjs
clean::
- $(RM) lib$(LIBBASE)$(SO_EXT)
$(RM) pkinit_kdf_test pkinit_kdf_test.o
check-unix:: pkinit_kdf_test
diff --git a/src/plugins/preauth/securid_sam2/Makefile.in b/src/plugins/preauth/securid_sam2/Makefile.in
index fff52c7..4245f8a 100644
--- a/src/plugins/preauth/securid_sam2/Makefile.in
+++ b/src/plugins/preauth/securid_sam2/Makefile.in
@@ -1,19 +1,11 @@
mydir=plugins$(S)preauth$(S)securid_sam2
BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
MODULE_INSTALL_DIR = $(KRB5_PA_MODULE_DIR)
-DEFS=@DEFS@
DEFINES=-DARL_SECURID_PREAUTH
-LOCALINCLUDES = -I../../../include/krb5 -I.
-
LIBBASE=securid_sam2
LIBMAJOR=0
LIBMINOR=0
-SO_EXT=.so
RELDIR=../plugins/preauth/securid_sam2
# Depends on libk5crypto and libkrb5
SHLIB_EXPDEPS = \
@@ -23,9 +15,6 @@ ACELIB= -laceclnt
SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto $(SUPPORT_LIB) $(KADMSRV_LIBS) \
$(LIBS) $(ACELIB)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-STOBJLISTS=OBJS.ST
STLIBOBJS=securid_sam2_main.o securid2.o grail.o
SRCS= $(srcdir)/securid_sam2_main.c $(srcdir)/securid2.c $(srcdir)/grail.c
@@ -34,8 +23,5 @@ all-unix:: all-libs
install-unix:: install-libs
clean-unix:: clean-libs clean-libobjs
-clean::
- $(RM) lib$(LIBBASE)$(SO_EXT)
-
@libnover_frag@
@libobj_frag@
diff --git a/src/plugins/preauth/wpse/Makefile.in b/src/plugins/preauth/wpse/Makefile.in
index ca6e87d..297be13 100644
--- a/src/plugins/preauth/wpse/Makefile.in
+++ b/src/plugins/preauth/wpse/Makefile.in
@@ -1,18 +1,10 @@
mydir=plugins$(S)preauth$(S)wpse
BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
MODULE_INSTALL_DIR = $(KRB5_PA_MODULE_DIR)
-DEFS=@DEFS@
-
-LOCALINCLUDES = -I../../../include/krb5 -I.
LIBBASE=wpse
LIBMAJOR=0
LIBMINOR=0
-SO_EXT=.so
RELDIR=../plugins/preauth/wpse
# Depends on libk5crypto and libkrb5
SHLIB_EXPDEPS = \
@@ -20,20 +12,14 @@ SHLIB_EXPDEPS = \
$(TOPLIBD)/libkrb5$(SHLIBEXT)
SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto $(SUPPORT_LIB) $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-STOBJLISTS=OBJS.ST
STLIBOBJS=wpse_main.o
SRCS=wpse_main.c
-all-unix:: $(LIBBASE)$(SO_EXT)
+all-unix:: all-libs
install-unix:: install-libs
clean-unix:: clean-libs clean-libobjs
-clean::
- $(RM) lib$(LIBBASE)$(SO_EXT)
-
@libnover_frag@
@libobj_frag@
diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in
index c4098e6..61e32ec 100644
--- a/src/slave/Makefile.in
+++ b/src/slave/Makefile.in
@@ -1,8 +1,5 @@
mydir=slave
BUILDTOP=$(REL)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
all:: kprop kpropd kproplog
diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index 23684c0..2358c89 100644
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -4,9 +4,6 @@ SUBDIRS = resolve asn.1 create hammer verify gssapi dejagnu shlib \
gss-threads misc mkeystash_compat
RUN_SETUP = @KRB5_RUN_ENV@ KRB5_KDC_PROFILE=kdc.conf KRB5_CONFIG=krb5.conf
-KRB5_RUN_ENV= @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
OBJS= gcred.o hist.o kdbtest.o t_localauth.o
EXTRADEPSRCS= gcred.c hist.c kdbtest.c t_localauth.c
diff --git a/src/tests/asn.1/Makefile.in b/src/tests/asn.1/Makefile.in
index 09d39a3..112a55e 100644
--- a/src/tests/asn.1/Makefile.in
+++ b/src/tests/asn.1/Makefile.in
@@ -1,11 +1,7 @@
mydir=tests$(S)asn.1
BUILDTOP=$(REL)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
LDAP=@LDAP@
-RUN_SETUP = @KRB5_RUN_ENV@
-
SRCS= $(srcdir)/krb5_encode_test.c $(srcdir)/krb5_decode_test.c \
$(srcdir)/krb5_decode_leak.c $(srcdir)/ktest.c \
$(srcdir)/ktest_equal.c $(srcdir)/utility.c \
diff --git a/src/tests/create/Makefile.in b/src/tests/create/Makefile.in
index 24870e9..a710bfb 100644
--- a/src/tests/create/Makefile.in
+++ b/src/tests/create/Makefile.in
@@ -1,7 +1,5 @@
mydir=tests$(S)create
BUILDTOP=$(REL)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
SRCS=$(srcdir)/kdb5_mkdums.c
KDB5_DEP_LIBS=$(THREAD_LINKOPTS) $(DL_LIB)
diff --git a/src/tests/dejagnu/Makefile.in b/src/tests/dejagnu/Makefile.in
index 6794a91..2dd831d 100644
--- a/src/tests/dejagnu/Makefile.in
+++ b/src/tests/dejagnu/Makefile.in
@@ -2,9 +2,6 @@ mydir=tests$(S)dejagnu
BUILDTOP=$(REL)..$(S)..
RUNTEST = @RUNTEST@ $(DEJAFLAGS)
RUNTESTFLAGS =
-KRB5_RUN_ENV= @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
SRCS=$(srcdir)/t_inetd.c
@@ -34,7 +31,7 @@ clean-unix::
$(RM) -rf tmpdir dbg.log krb.log krb.sum
runenv.vals: Makefile
- $(KRB5_RUN_ENV) for i in $(KRB5_RUN_VARS); do \
+ $(RUN_SETUP) for i in $(RUN_VARS); do \
eval echo "{$$i=\$$$$i}"; done > runenv.vals
site.exp: runenv.vals Makefile
diff --git a/src/tests/gss-threads/Makefile.in b/src/tests/gss-threads/Makefile.in
index 598dcf4..5ef52bf 100644
--- a/src/tests/gss-threads/Makefile.in
+++ b/src/tests/gss-threads/Makefile.in
@@ -3,8 +3,6 @@
mydir=tests$(S)gss-threads
BUILDTOP=$(REL)..$(S)..
DEFINES = -DUSE_AUTOCONF_H -DGSSAPI_V2
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
PTHREAD_LIBS=@PTHREAD_LIBS@
SRCS= $(srcdir)/gss-client.c $(srcdir)/gss-misc.c $(srcdir)/gss-server.c
diff --git a/src/tests/gssapi/Makefile.in b/src/tests/gssapi/Makefile.in
index 6a5870b..c53bda5 100644
--- a/src/tests/gssapi/Makefile.in
+++ b/src/tests/gssapi/Makefile.in
@@ -1,8 +1,6 @@
mydir=tests$(S)gssapi
BUILDTOP=$(REL)..$(S)..
DEFINES = -DUSE_AUTOCONF_H
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
SRCS= $(srcdir)/t_accname.c $(srcdir)/t_ccselect.c $(srcdir)/t_credstore.c \
$(srcdir)/t_export_cred.c $(srcdir)/t_export_name.c \
@@ -26,7 +24,7 @@ all:: ccinit ccrefresh t_accname t_ccselect t_credstore t_export_cred \
t_spnego t_oid
check-unix:: t_oid
- $(KRB5_RUN_ENV) $(VALGRIND) ./t_oid
+ $(RUN_SETUP) $(VALGRIND) ./t_oid
check-pytests:: ccinit ccrefresh t_accname t_ccselect t_credstore \
t_export_cred t_export_name t_imp_cred t_inq_cred t_inq_mechs_name \
diff --git a/src/tests/hammer/Makefile.in b/src/tests/hammer/Makefile.in
index c9d5515..d498a57 100644
--- a/src/tests/hammer/Makefile.in
+++ b/src/tests/hammer/Makefile.in
@@ -1,7 +1,5 @@
mydir=tests$(S)hammer
BUILDTOP=$(REL)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
SRCS=$(srcdir)/kdc5_hammer.c
diff --git a/src/tests/misc/Makefile.in b/src/tests/misc/Makefile.in
index 8a601bf..ed37359 100644
--- a/src/tests/misc/Makefile.in
+++ b/src/tests/misc/Makefile.in
@@ -1,8 +1,5 @@
mydir=tests$(S)misc
BUILDTOP=$(REL)..$(S)..
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
OBJS=\
test_getpw.o \
diff --git a/src/tests/mkeystash_compat/Makefile.in b/src/tests/mkeystash_compat/Makefile.in
index 30a8255..e858f0c 100644
--- a/src/tests/mkeystash_compat/Makefile.in
+++ b/src/tests/mkeystash_compat/Makefile.in
@@ -2,9 +2,6 @@ mydir=tests$(S)mkeystash_compat
BUILDTOP=$(REL)..$(S)..
RUN_SETUP = @KRB5_RUN_ENV@ KRB5_KDC_PROFILE=kdc.conf KRB5_CONFIG=krb5.conf
-KRB5_RUN_ENV= @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
OBJS = bigendian.o
SRCS = $(srcdir)/bigendian.c
diff --git a/src/tests/resolve/Makefile.in b/src/tests/resolve/Makefile.in
index be761c8..6d79dcb 100644
--- a/src/tests/resolve/Makefile.in
+++ b/src/tests/resolve/Makefile.in
@@ -1,8 +1,5 @@
mydir=tests$(S)resolve
BUILDTOP=$(REL)..$(S)..
-RUN_SETUP = @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
OBJS=resolve.o addrinfo-test.o fake-addrinfo-test.o
SRCS=$(srcdir)/resolve.c $(srcdir)/addrinfo-test.c \
diff --git a/src/tests/shlib/Makefile.in b/src/tests/shlib/Makefile.in
index d569cac..0401143 100644
--- a/src/tests/shlib/Makefile.in
+++ b/src/tests/shlib/Makefile.in
@@ -1,9 +1,5 @@
mydir=tests$(S)shlib
BUILDTOP=$(REL)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
-RUN_SETUP = @KRB5_RUN_ENV@
#VALGRIND=valgrind
#VALGRINDFLAGS=--tool=memcheck --leak-check=yes --show-reachable=yes
diff --git a/src/tests/threads/Makefile.in b/src/tests/threads/Makefile.in
index 58adde7..311e2c0 100644
--- a/src/tests/threads/Makefile.in
+++ b/src/tests/threads/Makefile.in
@@ -1,9 +1,5 @@
mydir=tests$(S)threads
BUILDTOP=$(REL)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
-RUN_SETUP = @KRB5_RUN_ENV@
SRCS=$(srcdir)/t_rcache.c \
$(srcdir)/gss-perf.c \
diff --git a/src/tests/verify/Makefile.in b/src/tests/verify/Makefile.in
index 0849418..1c31b25 100644
--- a/src/tests/verify/Makefile.in
+++ b/src/tests/verify/Makefile.in
@@ -1,7 +1,5 @@
mydir=tests$(S)verify
BUILDTOP=$(REL)..$(S)..
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
KDB5_DEP_LIB=$(THREAD_LINKOPTS) $(DL_LIB)
SRCS=$(srcdir)/kdb5_verify.c
diff --git a/src/util/collected-client-lib/Makefile.in b/src/util/collected-client-lib/Makefile.in
index d814c54..c233347 100644
--- a/src/util/collected-client-lib/Makefile.in
+++ b/src/util/collected-client-lib/Makefile.in
@@ -1,7 +1,6 @@
mydir=util$(S)collected-client-lib
BUILDTOP=$(REL)..$(S)..
RELDIR=../util/collected-client-lib
-DEFS=
##DOS##BUILDTOP = ..\..
##DOS##LIBNAME=$(OUTPRE)k5sprt32.lib
@@ -10,9 +9,6 @@ DEFS=
##DOS##OBJFILE=$(OUTPRE)k5sprt32.lst
##DOS##WIN64OBJFILE=$(OUTPRE)k5sprt64.lst
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
LIBBASE=collected
LIBMAJOR=1
LIBMINOR=0
@@ -67,8 +63,6 @@ SHLIB_EXPDEPS =
LIBS_UTILS=-lresolv
# Add -lm if dumping thread stats, for sqrt.
SHLIB_EXPLIBS= $(LIBS) $(DL_LIB) $(LIBS_UTILS)
-SHLIB_DIRS=
-SHLIB_RDIRS=
DEPLIBS=
diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index 4c68b60..25edc28 100644
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -6,7 +6,6 @@ mydir=util$(S)et
BUILDTOP=$(REL)..$(S)..
RELDIR=../util/et
SED = sed
-DEFS=
##DOS##BUILDTOP = ..\..
##DOS##LIBNAME=$(OUTPRE)comerr.lib
@@ -14,7 +13,6 @@ DEFS=
##DOS##OBJFILE=$(OUTPRE)comerr.lst
STLIBOBJS=error_message.o et_name.o com_err.o
-STOBJLISTS=OBJS.ST
LIBBASE=com_err
LIBMAJOR=3
LIBMINOR=0
@@ -54,9 +52,6 @@ SHLIB_LIBS=
SHLIB_EXPDEPS = $(SUPPORT_DEPLIB)
SHLIB_EXPLIBS=-l$(SUPPORT_LIBNAME) $(LIBS)
SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
-SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-SHLIB_DIRS=-L$(TOPLIBD)
COM_ERR_HDR=$(BUILDTOP)$(S)include$(S)com_err.h
@@ -120,8 +115,6 @@ do-its4: error_table.y et_lex.lex.c
#t_com_err: t_com_err.o et1.o et2.o $(LIBOBJS)
# $(CC) -o t_com_err t_com_err.o et1.o et2.o $(LIBOBJS)
-PROG_RPATH=$(KRB5_LIBDIR)
-PROG_LIBPATH=-L$(TOPLIBD)
test_et: test_et.o test1.o test2.o $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB)
$(CC_LINK) -o test_et test_et.o test1.o test2.o -lcom_err $(SUPPORT_LIB)
t_com_err: t_com_err.o et1.o et2.o $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB)
@@ -145,7 +138,6 @@ includes:: com_err.h
clean-unix::
$(RM) $(BUILDTOP)/include/com_err.h
-RUN_SETUP = @KRB5_RUN_ENV@
# test_et doesn't have an interesting exit status, but it'll exercise
# some cases that t_com_err doesn't, so let's see if it crashes.
check-unix:: t_com_err test_et
diff --git a/src/util/gss-kernel-lib/Makefile.in b/src/util/gss-kernel-lib/Makefile.in
index 0c57976..c502494 100644
--- a/src/util/gss-kernel-lib/Makefile.in
+++ b/src/util/gss-kernel-lib/Makefile.in
@@ -1,19 +1,14 @@
mydir=util/gss-kernel-lib
BUILDTOP=$(REL)..$(S)..
-KRB5_RUN_ENV=@KRB5_RUN_ENV@
-
DEFINES=-DKRB5_KERNEL
ALL_CFLAGS=$(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(DEFS) $(DEFINES) -I. -Igssapi
-PROG_LIBPATH=-L$(TOPLIBD)
SHLIB_EXPDEPS = \
$(TOPLIBD)/libk5crypto$(SHLIBEXT) \
$(TOPLIBD)/libkrb5$(SHLIBEXT)
SHLIB_EXPLIBS=-lgssrpc -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) $(LIBS)
-STOBJLISTS=OBJS.ST
-
SRCS= \
k5seal.c \
k5sealiov.c \
diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in
index e88094e..f1418fb 100644
--- a/src/util/profile/Makefile.in
+++ b/src/util/profile/Makefile.in
@@ -3,8 +3,6 @@ BUILDTOP=$(REL)..$(S)..
SUBDIRS=testmod
PROG_LIBPATH=-L$(TOPLIBD) $(TCL_LIBPATH) -L.
PROG_RPATH=$(KRB5_LIBDIR)$(TCL_RPATH)
-KRB5_RUN_ENV=@KRB5_RUN_ENV@
-DEFS=
##DOS##BUILDTOP = ..\..
##DOS##OBJFILE=$(OUTPRE)profile.lst
##DOS##LIBNAME=$(OUTPRE)profile.lib
@@ -50,10 +48,6 @@ LIBMAJOR=1
LIBMINOR=1
SHLIB_EXPDEPS = $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB)
SHLIB_EXPLIBS = -lcom_err $(SUPPORT_LIB) $(LIBS)
-SHLIB_DIRS = -L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
-
-STOBJLISTS=OBJS.ST
PROFILE_HDR=$(BUILDTOP)$(S)include$(S)profile.h
@@ -148,8 +142,8 @@ clean-windows::
$(RM) $(PROFILE_HDR)
check-unix:: test_parse test_profile test_vtable test_load modtest.conf
- $(KRB5_RUN_ENV) $(VALGRIND) ./test_vtable
- $(KRB5_RUN_ENV) $(VALGRIND) ./test_load
+ $(RUN_SETUP) $(VALGRIND) ./test_vtable
+ $(RUN_SETUP) $(VALGRIND) ./test_load
DO_TCL=@DO_TCL@
check-unix:: check-unix-tcl-$(DO_TCL)
@@ -161,7 +155,7 @@ check-unix-tcl-:
check-unix-tcl-ok: profile_tcl
cp $(srcdir)/test.ini test2.ini
- $(KRB5_RUN_ENV) $(VALGRIND) ./profile_tcl $(srcdir)/prof_test1
+ $(RUN_SETUP) $(VALGRIND) ./profile_tcl $(srcdir)/prof_test1
check-windows:: $(OUTPRE)test_profile.exe $(OUTPRE)test_parse.exe
$(RM) $(OUTPRE)*.obj
diff --git a/src/util/profile/testmod/Makefile.in b/src/util/profile/testmod/Makefile.in
index bc2dbc5..b4e63ff 100644
--- a/src/util/profile/testmod/Makefile.in
+++ b/src/util/profile/testmod/Makefile.in
@@ -1,21 +1,15 @@
mydir=util$(S)profile$(S)testmod
BUILDTOP=$(REL)..$(S)..$(S)..
-KRB5_RUN_ENV = @KRB5_RUN_ENV@
-DEFS=@DEFS@
LOCALINCLUDES = -I.. -I$(srcdir)/..
LIBBASE=proftest
LIBMAJOR=0
LIBMINOR=0
-SO_EXT=.so
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
SHLIB_EXPLIBS=$(SUPPORT_LIB) $(LIBS)
SHLIB_EXPDEPS=$(SUPPORT_DEPLIB)
-STOBJLISTS=OBJS.ST
STLIBOBJS=testmod_main.o
SRCS=$(srcdir)/testmod_main.c
diff --git a/src/util/ss/Makefile.in b/src/util/ss/Makefile.in
index 07b36cb..0e2e47d 100644
--- a/src/util/ss/Makefile.in
+++ b/src/util/ss/Makefile.in
@@ -1,7 +1,6 @@
mydir=util$(S)ss
BUILDTOP=$(REL)..$(S)..
SED = sed
-DEFS=
INSTALLLIB=cp
INSTALLFILE=cp
@@ -15,8 +14,6 @@ LIBMAJOR=1
LIBMINOR=0
RELDIR=../util/ss
-STOBJLISTS=OBJS.ST
-
clean-unix:: clean-liblinks clean-libs clean-libobjs
install-unix:: install-libs
diff --git a/src/util/support/Makefile.in b/src/util/support/Makefile.in
index 197d5aa..01be06d 100644
--- a/src/util/support/Makefile.in
+++ b/src/util/support/Makefile.in
@@ -1,7 +1,6 @@
mydir=util$(S)support
BUILDTOP=$(REL)..$(S)..
RELDIR=../util/support
-DEFS=
##DOS##BUILDTOP = ..\..
##DOS##LIBNAME=$(OUTPRE)k5sprt32.lib
@@ -12,10 +11,6 @@ DEFS=
SED = sed
-KRB5_RUN_ENV= @KRB5_RUN_ENV@
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
LIBBASE=krb5support
LIBMAJOR=@SUPPORTLIB_MAJOR@
LIBMINOR=1
@@ -104,12 +99,6 @@ LIBOBJS= \
$(PRINTF_OBJ) \
$(MKSTEMP_OBJ)
-STOBJLISTS=OBJS.ST
-
-INSTALLFILE = cp
-
-LOCALINCLUDES=-I. -I$(srcdir)
-
SRCS=\
$(srcdir)/threads.c \
$(srcdir)/init-addrinfo.c \
@@ -137,8 +126,6 @@ SRCS=\
SHLIB_EXPDEPS =
# Add -lm if dumping thread stats, for sqrt.
SHLIB_EXPLIBS= $(LIBS) $(DL_LIB)
-SHLIB_DIRS=
-SHLIB_RDIRS=$(KRB5_LIBDIR)
DEPLIBS=
diff --git a/src/util/verto/Makefile.in b/src/util/verto/Makefile.in
index 466044e..0d51cb8 100644
--- a/src/util/verto/Makefile.in
+++ b/src/util/verto/Makefile.in
@@ -19,10 +19,7 @@ LIBOBJS=$(OUTPRE)verto.$(OBJEXT) \
$(OUTPRE)verto-k5ev.$(OBJEXT)
SRCS=verto.c module.c verto-k5ev.c
-STOBJLISTS=OBJS.ST
SHLIB_EXPLIBS= $(LIBS) -lm # libm needed for ceil() currently.
-SHLIB_DIRS=
-SHLIB_RDIRS=$(KRB5_LIBDIR)
VERTO_HDR=$(BUILDTOP)$(S)include$(S)verto.h
More information about the cvs-krb5
mailing list