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/lib/krb5/os | |
| 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/lib/krb5/os')
| -rw-r--r-- | src/lib/krb5/os/Makefile.in | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in index 6a0961990..0353a8476 100644 --- a/src/lib/krb5/os/Makefile.in +++ b/src/lib/krb5/os/Makefile.in @@ -1,9 +1,5 @@ mydir=lib$(S)krb5$(S)os BUILDTOP=$(REL)..$(S)..$(S).. -KRB5_RUN_ENV = @KRB5_RUN_ENV@ -PROG_LIBPATH=-L$(TOPLIBD) -PROG_RPATH=$(KRB5_LIBDIR) -DEFS= DEFINES=-DLIBDIR=\"$(KRB5_LIBDIR)\" -DBINDIR=\"$(CLIENT_BINDIR)\" \ -DSBINDIR=\"$(ADMIN_BINDIR)\" LOCALINCLUDES=-I$(top_srcdir)/util/profile @@ -195,7 +191,7 @@ check-unix:: check-unix-stdconf check-unix-locate check-unix-trace \ check-unix-stdconf:: t_std_conf KRB5_CONFIG=$(srcdir)/td_krb5.conf ; export KRB5_CONFIG ;\ - $(KRB5_RUN_ENV) $(VALGRIND) ./t_std_conf -d -s NEW.DEFAULT.REALM -d \ + $(RUN_SETUP) $(VALGRIND) ./t_std_conf -d -s NEW.DEFAULT.REALM -d \ -D DEFAULT_REALM.TST -r bad.idea -r itar.bad.idea \ -r really.BAD.IDEA. -r clipper.bad.idea -r KeYEsCrOW.BaD.IDea \ -r pgp.good.idea -r no_domain > test.out @@ -215,7 +211,7 @@ check-unix-locate:: t_locate_kdc if $(DIG) $(SRVNAME) srv | grep -i $(DIGPAT) || \ $(NSLOOKUP) -q=srv $(SRVNAME) | grep -i $(NSPAT); then \ KRB5_CONFIG=$(srcdir)/td_krb5.conf ; export KRB5_CONFIG ;\ - $(KRB5_RUN_ENV) $(VALGRIND) ./t_locate_kdc $(LOCREALM); \ + $(RUN_SETUP) $(VALGRIND) ./t_locate_kdc $(LOCREALM); \ else \ echo '*** WARNING: skipped t_locate_kdc test: known DNS name not found'; \ fi; \ @@ -226,15 +222,15 @@ check-unix-locate:: t_locate_kdc check-unix-trace:: t_trace rm -f t_trace.out KRB5_TRACE=t_trace.out ; export KRB5_TRACE ; \ - $(KRB5_RUN_ENV) $(VALGRIND) ./t_trace + $(RUN_SETUP) $(VALGRIND) ./t_trace sed -e 's/^[^:]*: //' t_trace.out | cmp - $(srcdir)/t_trace.ref rm -f t_trace.out check-unix-expand:: t_expand_path - $(KRB5_RUN_ENV) $(VALGRIND) ./t_expand_path '%{null}' '' - $(KRB5_RUN_ENV) $(VALGRIND) ./t_expand_path ' %{BINDIR}%{LIBDIR} ' \ + $(RUN_SETUP) $(VALGRIND) ./t_expand_path '%{null}' '' + $(RUN_SETUP) $(VALGRIND) ./t_expand_path ' %{BINDIR}%{LIBDIR} ' \ ' $(CLIENT_BINDIR)$(KRB5_LIBDIR) ' - $(KRB5_RUN_ENV) $(VALGRIND) ./t_expand_path \ + $(RUN_SETUP) $(VALGRIND) ./t_expand_path \ 'the %{animal}%{s} on the %{place}%{s}' \ 'the frogs on the pads' |