summaryrefslogtreecommitdiffstats
path: root/src/lib/rpc
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/lib/rpc
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/lib/rpc')
-rw-r--r--src/lib/rpc/Makefile.in4
-rw-r--r--src/lib/rpc/unit-test/Makefile.in4
2 files changed, 0 insertions, 8 deletions
diff --git a/src/lib/rpc/Makefile.in b/src/lib/rpc/Makefile.in
index dc142ba86..745d22d50 100644
--- a/src/lib/rpc/Makefile.in
+++ b/src/lib/rpc/Makefile.in
@@ -1,7 +1,6 @@
mydir=lib$(S)rpc
BUILDTOP=$(REL)..$(S)..
DEFINES = -DGSSAPI_KRB5 -DDEBUG_GSSAPI=0 -DGSSRPC__IMPL
-DEFS=
SUBDIRS=unit-test
@@ -11,15 +10,12 @@ SUBDIRS=unit-test
LIBBASE=gssrpc
LIBMAJOR=4
LIBMINOR=1
-STOBJLISTS=OBJS.ST
SHLIB_EXPDEPS= \
$(TOPLIBD)/libgssapi_krb5$(SHLIBEXT) \
$(TOPLIBD)/libkrb5$(SHLIBEXT) \
$(TOPLIBD)/libk5crypto$(SHLIBEXT) \
$(COM_ERR_DEPLIB)
SHLIB_EXPLIBS=-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err $(LIBS)
-SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_RDIRS=$(KRB5_LIBDIR)
RELDIR=rpc
SRCS = $(srcdir)/auth_none.c \
diff --git a/src/lib/rpc/unit-test/Makefile.in b/src/lib/rpc/unit-test/Makefile.in
index 0642e53de..b72487c68 100644
--- a/src/lib/rpc/unit-test/Makefile.in
+++ b/src/lib/rpc/unit-test/Makefile.in
@@ -1,9 +1,5 @@
mydir=lib$(S)rpc$(S)unit-test
BUILDTOP=$(REL)..$(S)..$(S)..
-LOCALINCLUDES = -I.
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-DEFS=
OBJS= client.o rpc_test_clnt.o rpc_test_svc.o server.o
SRCS= client.c rpc_test_clnt.c rpc_test_svc.c server.c