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/appl | |
| 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/appl')
| -rw-r--r-- | src/appl/gss-sample/Makefile.in | 2 | ||||
| -rw-r--r-- | src/appl/sample/sclient/Makefile.in | 3 | ||||
| -rw-r--r-- | src/appl/sample/sserver/Makefile.in | 3 | ||||
| -rw-r--r-- | src/appl/simple/client/Makefile.in | 4 | ||||
| -rw-r--r-- | src/appl/simple/server/Makefile.in | 5 | ||||
| -rw-r--r-- | src/appl/user_user/Makefile.in | 2 |
6 files changed, 2 insertions, 17 deletions
diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in index 87931b94d..0f67c0c05 100644 --- a/src/appl/gss-sample/Makefile.in +++ b/src/appl/gss-sample/Makefile.in @@ -1,8 +1,6 @@ mydir=appl$(S)gss-sample BUILDTOP=$(REL)..$(S).. DEFINES = -DUSE_AUTOCONF_H -DGSSAPI_V2 -PROG_LIBPATH=-L$(TOPLIBD) -PROG_RPATH=$(KRB5_LIBDIR) SRCS= $(srcdir)/gss-client.c $(srcdir)/gss-misc.c $(srcdir)/gss-server.c diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in index 069c42035..3d8df3347 100644 --- a/src/appl/sample/sclient/Makefile.in +++ b/src/appl/sample/sclient/Makefile.in @@ -1,8 +1,5 @@ mydir=appl$(S)sample$(S)sclient - BUILDTOP=$(REL)..$(S)..$(S).. -PROG_LIBPATH=-L$(TOPLIBD) -PROG_RPATH=$(KRB5_LIBDIR) all:: sclient diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in index 7205788bc..634e5a6b4 100644 --- a/src/appl/sample/sserver/Makefile.in +++ b/src/appl/sample/sserver/Makefile.in @@ -1,8 +1,5 @@ mydir=appl$(S)sample$(S)sserver - BUILDTOP=$(REL)..$(S)..$(S).. -PROG_LIBPATH=-L$(TOPLIBD) -PROG_RPATH=$(KRB5_LIBDIR) all:: sserver diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in index c357c1253..d59baac7b 100644 --- a/src/appl/simple/client/Makefile.in +++ b/src/appl/simple/client/Makefile.in @@ -1,11 +1,9 @@ mydir=appl$(S)simple$(S)client BUILDTOP=$(REL)..$(S)..$(S).. -PROG_LIBPATH=-L$(TOPLIBD) -PROG_RPATH=$(KRB5_LIBDIR) all:: sim_client -LOCALINCLUDES= -I.. -I$(srcdir)/.. +LOCALINCLUDES= -I$(srcdir)/.. sim_client: sim_client.o $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o sim_client sim_client.o $(KRB5_BASE_LIBS) diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in index 1795bc896..a99264568 100644 --- a/src/appl/simple/server/Makefile.in +++ b/src/appl/simple/server/Makefile.in @@ -1,10 +1,7 @@ mydir=appl$(S)simple$(S)server BUILDTOP=$(REL)..$(S)..$(S).. -LOCALINCLUDES= -I.. -I$(srcdir)/.. - -PROG_LIBPATH=-L$(TOPLIBD) -PROG_RPATH=$(KRB5_LIBDIR) +LOCALINCLUDES= -I$(srcdir)/.. all:: sim_server diff --git a/src/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in index 20ddc5911..86408602a 100644 --- a/src/appl/user_user/Makefile.in +++ b/src/appl/user_user/Makefile.in @@ -2,8 +2,6 @@ mydir=appl$(S)user_user BUILDTOP=$(REL)..$(S).. # If you remove the -DDEBUG, the test program needs a line changed DEFINES = -DDEBUG -PROG_LIBPATH=-L$(TOPLIBD) -PROG_RPATH=$(KRB5_LIBDIR) all:: uuclient uuserver |