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/kadmin | |
| 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/kadmin')
| -rw-r--r-- | src/kadmin/cli/Makefile.in | 3 | ||||
| -rw-r--r-- | src/kadmin/dbutil/Makefile.in | 3 | ||||
| -rw-r--r-- | src/kadmin/ktutil/Makefile.in | 3 | ||||
| -rw-r--r-- | src/kadmin/server/Makefile.in | 4 | ||||
| -rw-r--r-- | src/kadmin/testing/util/Makefile.in | 1 |
5 files changed, 0 insertions, 14 deletions
diff --git a/src/kadmin/cli/Makefile.in b/src/kadmin/cli/Makefile.in index 2681399ba..789c597f4 100644 --- a/src/kadmin/cli/Makefile.in +++ b/src/kadmin/cli/Makefile.in @@ -1,9 +1,6 @@ mydir=kadmin$(S)cli BUILDTOP=$(REL)..$(S).. -PROG_LIBPATH=-L$(TOPLIBD) -PROG_RPATH=$(KRB5_LIBDIR) KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS) -DEFS= PROG = kadmin COMMON_OBJS = kadmin.o kadmin_ct.o ss_wrapper.o getdate.o diff --git a/src/kadmin/dbutil/Makefile.in b/src/kadmin/dbutil/Makefile.in index 58c517aba..047587afc 100644 --- a/src/kadmin/dbutil/Makefile.in +++ b/src/kadmin/dbutil/Makefile.in @@ -1,9 +1,6 @@ mydir=kadmin$(S)dbutil BUILDTOP=$(REL)..$(S).. -DEFS= LOCALINCLUDES = -I. -PROG_LIBPATH=-L$(TOPLIBD) $(KRB5_LIBPATH) -PROG_RPATH=$(KRB5_LIBDIR) KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS) PROG = kdb5_util diff --git a/src/kadmin/ktutil/Makefile.in b/src/kadmin/ktutil/Makefile.in index f92bcb270..e92f84f0e 100644 --- a/src/kadmin/ktutil/Makefile.in +++ b/src/kadmin/ktutil/Makefile.in @@ -1,8 +1,5 @@ mydir=kadmin$(S)ktutil BUILDTOP=$(REL)..$(S).. -PROG_LIBPATH=-L$(TOPLIBD) -PROG_RPATH=$(KRB5_LIBDIR) -DEFS= OBJS= ktutil.o \ ktutil_ct.o \ diff --git a/src/kadmin/server/Makefile.in b/src/kadmin/server/Makefile.in index 694227d11..3218307f3 100644 --- a/src/kadmin/server/Makefile.in +++ b/src/kadmin/server/Makefile.in @@ -1,15 +1,11 @@ mydir=kadmin$(S)server BUILDTOP=$(REL)..$(S).. KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS) -DEFS= LOCALINCLUDES = -I$(top_srcdir)/lib/gssapi/generic \ -I$(top_srcdir)/lib/gssapi/krb5 -I$(BUILDTOP)/lib/gssapi/generic \ -I$(BUILDTOP)/lib/gssapi/krb5 -I$(top_srcdir)/lib/kadm5/srv -PROG_LIBPATH=-L$(TOPLIBD) -PROG_RPATH=$(KRB5_LIBDIR) - PROG = kadmind OBJS = kadm_rpc_svc.o server_stubs.o ovsec_kadmd.o schpw.o misc.o ipropd_svc.o SRCS = kadm_rpc_svc.c server_stubs.c ovsec_kadmd.c schpw.c misc.c ipropd_svc.c diff --git a/src/kadmin/testing/util/Makefile.in b/src/kadmin/testing/util/Makefile.in index 745a73ddd..6bb6f60c0 100644 --- a/src/kadmin/testing/util/Makefile.in +++ b/src/kadmin/testing/util/Makefile.in @@ -4,7 +4,6 @@ LOCALINCLUDES = $(TCL_INCLUDES) -I$(BUILDTOP)/lib/kdb/ # Force Tcl headers to use stdarg.h, because krb5 does too, and if # Tcl uses varargs.h it'll just mess things up. DEFINES= -DHAS_STDARG -DEFS= KRB5_PTHREAD_LIB=$(THREAD_LINKOPTS) PROG_LIBPATH=-L$(TOPLIBD) $(TCL_LIBPATH) |