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/util/profile | |
| parent | 780b34cd19c0360458395e87f35550e9803a5194 (diff) | |
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/util/profile')
| -rw-r--r-- | src/util/profile/Makefile.in | 12 | ||||
| -rw-r--r-- | src/util/profile/testmod/Makefile.in | 6 |
2 files changed, 3 insertions, 15 deletions
diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in index e88094ecc..f1418fb7f 100644 --- a/src/util/profile/Makefile.in +++ b/src/util/profile/Makefile.in @@ -3,8 +3,6 @@ BUILDTOP=$(REL)..$(S).. SUBDIRS=testmod PROG_LIBPATH=-L$(TOPLIBD) $(TCL_LIBPATH) -L. PROG_RPATH=$(KRB5_LIBDIR)$(TCL_RPATH) -KRB5_RUN_ENV=@KRB5_RUN_ENV@ -DEFS= ##DOS##BUILDTOP = ..\.. ##DOS##OBJFILE=$(OUTPRE)profile.lst ##DOS##LIBNAME=$(OUTPRE)profile.lib @@ -50,10 +48,6 @@ LIBMAJOR=1 LIBMINOR=1 SHLIB_EXPDEPS = $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB) SHLIB_EXPLIBS = -lcom_err $(SUPPORT_LIB) $(LIBS) -SHLIB_DIRS = -L$(TOPLIBD) -SHLIB_RDIRS=$(KRB5_LIBDIR) - -STOBJLISTS=OBJS.ST PROFILE_HDR=$(BUILDTOP)$(S)include$(S)profile.h @@ -148,8 +142,8 @@ clean-windows:: $(RM) $(PROFILE_HDR) check-unix:: test_parse test_profile test_vtable test_load modtest.conf - $(KRB5_RUN_ENV) $(VALGRIND) ./test_vtable - $(KRB5_RUN_ENV) $(VALGRIND) ./test_load + $(RUN_SETUP) $(VALGRIND) ./test_vtable + $(RUN_SETUP) $(VALGRIND) ./test_load DO_TCL=@DO_TCL@ check-unix:: check-unix-tcl-$(DO_TCL) @@ -161,7 +155,7 @@ check-unix-tcl-: check-unix-tcl-ok: profile_tcl cp $(srcdir)/test.ini test2.ini - $(KRB5_RUN_ENV) $(VALGRIND) ./profile_tcl $(srcdir)/prof_test1 + $(RUN_SETUP) $(VALGRIND) ./profile_tcl $(srcdir)/prof_test1 check-windows:: $(OUTPRE)test_profile.exe $(OUTPRE)test_parse.exe $(RM) $(OUTPRE)*.obj diff --git a/src/util/profile/testmod/Makefile.in b/src/util/profile/testmod/Makefile.in index bc2dbc5db..b4e63ff49 100644 --- a/src/util/profile/testmod/Makefile.in +++ b/src/util/profile/testmod/Makefile.in @@ -1,21 +1,15 @@ mydir=util$(S)profile$(S)testmod BUILDTOP=$(REL)..$(S)..$(S).. -KRB5_RUN_ENV = @KRB5_RUN_ENV@ -DEFS=@DEFS@ LOCALINCLUDES = -I.. -I$(srcdir)/.. LIBBASE=proftest LIBMAJOR=0 LIBMINOR=0 -SO_EXT=.so -SHLIB_DIRS=-L$(TOPLIBD) -SHLIB_RDIRS=$(KRB5_LIBDIR) SHLIB_EXPLIBS=$(SUPPORT_LIB) $(LIBS) SHLIB_EXPDEPS=$(SUPPORT_DEPLIB) -STOBJLISTS=OBJS.ST STLIBOBJS=testmod_main.o SRCS=$(srcdir)/testmod_main.c |