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.

9 files changed, 0 insertions, 33 deletions

diff --git a/src/clients/kcpytkt/Makefile.in b/src/clients/kcpytkt/Makefile.in
index c4e81c1929..ea73514993 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 5c7b183971..e140b7b41a 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 e3d1c673a3..f29935277a 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 44e377426b..b1cd278a53 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 20d66ab08c..3cdbb86ddf 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 09ca194143..3445c9f0de 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 6cecf0dff4..c705fda7f0 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 2ae457b11f..b46fec6224 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 16ade48044..58519ae36e 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