diff options
| author | Tom Yu <tlyu@mit.edu> | 2003-03-03 07:09:46 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2003-03-03 07:09:46 +0000 |
| commit | d7945a6727cfa39039434d4da63a7080a91cabcd (patch) | |
| tree | 129a190d2d2a1b1c7375edce2121e7b06b2aa152 /src/config/pre.in | |
| parent | 5df5c4bb6ffecf8f3ea304209a40f9f5ea1a4989 (diff) | |
| download | krb5-d7945a6727cfa39039434d4da63a7080a91cabcd.tar.gz krb5-d7945a6727cfa39039434d4da63a7080a91cabcd.tar.xz krb5-d7945a6727cfa39039434d4da63a7080a91cabcd.zip | |
Remove ADD_DEF and uses thereof, and move the appropriate symbols to
AC_DEFINE'ed things or to Makefile.in files. Remove explicit settings
of CPPFLAGS. These allow CPPFLAGS to be a user parameter. Also, add
CFLAGS to the CC_LINK variables, so they can control usage of the
compiler to link programs.
ticket: 677
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15214 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/config/pre.in')
| -rw-r--r-- | src/config/pre.in | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/config/pre.in b/src/config/pre.in index 9d9b8776b..c36b4ee8b 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -123,13 +123,22 @@ SRCTOP = @srcdir@/$(BUILDTOP) VPATH = @srcdir@ CONFIG_RELTOPDIR = @CONFIG_RELTOPDIR@ -ALL_CFLAGS = $(DEFS) $(DEFINES) $(LOCALINCLUDES) $(CPPFLAGS) $(CFLAGS) +# DEFS set by configure +# DEFINES set by local Makefile.in +# LOCALINCLUDES set by local Makefile.in +# CPPFLAGS user override +# CFLAGS user override but starts off set by configure +ALL_CFLAGS = $(DEFS) $(DEFINES) $(KRB_INCLUDES) $(LOCALINCLUDES) \ + $(CPPFLAGS) $(CFLAGS) + CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ DEFS = @DEFS@ CC = @CC@ LD = $(PURE) @LD@ DEPLIBS = @DEPLIBS@ +KRB_INCLUDES = -I$(BUILDTOP)/include -I$(SRCTOP)/include \ + -I$(BUILDTOP)/include/krb5 -I$(SRCTOP)/include/krb5 LDFLAGS = @LDFLAGS@ LD_UNRESOLVED_PREFIX = @LD_UNRESOLVED_PREFIX@ LD_SHLIBDIR_PREFIX = @LD_SHLIBDIR_PREFIX@ |