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.

17 files changed, 4 insertions, 182 deletions

diff --git a/src/plugins/authdata/greet/Makefile.in b/src/plugins/authdata/greet/Makefile.in
index ce70925cf0..f204e2f3a9 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 74e4bf42a9..7f7277b101 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 40b1856bb4..598ee1fa30 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 17ca242042..617371da34 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 6dd9e2ef5b..dac32752c0 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-@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-@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 d2df68c79c..0de98a9f4f 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 854d50d36a..24adcbe996 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 12ec6fd6a3..bf52f10a73 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 36a03e2aa7..3dd4ba6bb7 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 73a4c67866..b9ea339057 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 fd65da8cc2..d302cf2f96 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 fd1d656532..c509f837be 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 5b5484026b..38bed860e9 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 82c5a7b047..0db924e627 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 1acb83e891..32d010f999 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 fff52c7291..4245f8a6a6 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 ca6e87d715..297be13796 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@