From 4b0985f8573840838bcfa8ec1df3dcd39a3dbf15 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Thu, 16 May 2013 14:21:12 -0400 Subject: 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/plugins/preauth/wpse/Makefile.in | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'src/plugins/preauth/wpse') diff --git a/src/plugins/preauth/wpse/Makefile.in b/src/plugins/preauth/wpse/Makefile.in index ca6e87d71..297be1379 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@ -- cgit