diff options
| author | Greg Hudson <ghudson@mit.edu> | 2013-05-16 14:21:12 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2013-05-16 20:09:27 -0400 |
| commit | 4b0985f8573840838bcfa8ec1df3dcd39a3dbf15 (patch) | |
| tree | a9ac284b8ef9000f968cb610cc8ff79061e8293b /src/plugins/preauth/pkinit | |
| parent | 780b34cd19c0360458395e87f35550e9803a5194 (diff) | |
| download | krb5-4b0985f8573840838bcfa8ec1df3dcd39a3dbf15.tar.gz krb5-4b0985f8573840838bcfa8ec1df3dcd39a3dbf15.tar.xz krb5-4b0985f8573840838bcfa8ec1df3dcd39a3dbf15.zip | |
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.
Diffstat (limited to 'src/plugins/preauth/pkinit')
| -rw-r--r-- | src/plugins/preauth/pkinit/Makefile.in | 14 |
1 files changed, 1 insertions, 13 deletions
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 |