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.

13 files changed, 2 insertions, 39 deletions

diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index 23684c0106..2358c898b4 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 09d39a3e09..112a55e09d 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 24870e941a..a710bfbab2 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 6794a91d6e..2dd831d900 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 598dcf4093..5ef52bf204 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 6a5870b01a..c53bda5021 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 c9d551568d..d498a574c0 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 8a601bf0da..ed37359551 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 30a8255a4a..e858f0c5e2 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 be761c8d55..6d79dcbf37 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 d569cacd73..0401143fc7 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 58adde7d7d..311e2c04f3 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 0849418024..1c31b25b49 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