summaryrefslogtreecommitdiffstats
path: root/src/plugins/kdb/db2/libdb2/test
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2013-05-16 14:21:12 -0400
committerGreg Hudson <ghudson@mit.edu>2013-05-16 20:09:27 -0400
commit4b0985f8573840838bcfa8ec1df3dcd39a3dbf15 (patch)
treea9ac284b8ef9000f968cb610cc8ff79061e8293b /src/plugins/kdb/db2/libdb2/test
parent780b34cd19c0360458395e87f35550e9803a5194 (diff)
downloadkrb5-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/kdb/db2/libdb2/test')
-rw-r--r--src/plugins/kdb/db2/libdb2/test/Makefile.in5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/plugins/kdb/db2/libdb2/test/Makefile.in b/src/plugins/kdb/db2/libdb2/test/Makefile.in
index 854d50d36..24adcbe99 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 $@