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.

8 files changed, 3 insertions, 53 deletions

diff --git a/src/util/collected-client-lib/Makefile.in b/src/util/collected-client-lib/Makefile.in
index d814c54996..c233347aa0 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 4c68b6090c..25edc28017 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 0c57976469..c502494a96 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 e88094ecce..f1418fb7fe 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 bc2dbc5db9..b4e63ff493 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 07b36cb695..0e2e47d431 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 197d5aa7f9..01be06d217 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 466044e2df..0d51cb84cd 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