Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES, LOCAL_INCLUDES such

that one can override CFLAGS from the command line without losing CPP
search patchs and defines. Some associated Makefile cleanup.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11876 dc483132-0cff-0310-8789-dd5450dbe970

8 files changed, 49 insertions, 53 deletions

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index b374d7cd49..3b4fd5d9bf 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -3,7 +3,6 @@ myfulldir=util
 mydir=util
 MY_SUBDIRS=et ss profile pty dyn db2 send-pr
 BUILDTOP=$(REL)$(U)
-CFLAGS = $(CCOPTS)
 
 MAC_SUBDIRS = profile et
 
diff --git a/src/util/db2/obj/Makefile.in b/src/util/db2/obj/Makefile.in
index b81a78efbf..6c6f840f70 100644
--- a/src/util/db2/obj/Makefile.in
+++ b/src/util/db2/obj/Makefile.in
@@ -36,9 +36,10 @@ libdir = @libdir@
 
 CDEBUGFLAGS = @CFLAGS@
 
-CFLAGS = $(CDEBUGFLAGS) @CPPFLAGS@ @DEFS@ \
-	-I. -I$(top_srcdir)/include -I$(top_srcdir)/mpool -I$(top_srcdir)/db \
+CFLAGS = $(CDEBUGFLAGS)
+LOCALINCLUDES = -I. -I$(top_srcdir)/include -I$(top_srcdir)/mpool -I$(top_srcdir)/db \
 	-I$(top_srcdir)/hash -I$(top_srcdir)/btree -I$(top_srcdir)/recno
+ALL_CFLAGS = $(DEFS) $(LOCALINCLUDES) $(CPPFLAGS) $(CFLAGS)
 
 all:: $(LIBDB) db.h
 
@@ -71,83 +72,83 @@ clean::
 ## but it doesn't, so I do this instead:
 
 db.o: $(top_srcdir)/db/db.c
-	$(CC) $(CFLAGS) -c -o db.o $(top_srcdir)/db/db.c
+	$(CC) $(ALL_CFLAGS) -c -o db.o $(top_srcdir)/db/db.c
 
 mpool.o: $(top_srcdir)/mpool/mpool.c
-	$(CC) $(CFLAGS) -c -o mpool.o $(top_srcdir)/mpool/mpool.c
+	$(CC) $(ALL_CFLAGS) -c -o mpool.o $(top_srcdir)/mpool/mpool.c
 
 hash.o: $(top_srcdir)/hash/hash.c
-	$(CC) $(CFLAGS) -c -o hash.o $(top_srcdir)/hash/hash.c
+	$(CC) $(ALL_CFLAGS) -c -o hash.o $(top_srcdir)/hash/hash.c
 hash_bigkey.o: $(top_srcdir)/hash/hash_bigkey.c
-	$(CC) $(CFLAGS) -c -o hash_bigkey.o $(top_srcdir)/hash/hash_bigkey.c
+	$(CC) $(ALL_CFLAGS) -c -o hash_bigkey.o $(top_srcdir)/hash/hash_bigkey.c
 hash_debug.o: $(top_srcdir)/hash/hash_debug.c
-	$(CC) $(CFLAGS) -c -o hash_debug.o $(top_srcdir)/hash/hash_debug.c
+	$(CC) $(ALL_CFLAGS) -c -o hash_debug.o $(top_srcdir)/hash/hash_debug.c
 hash_func.o: $(top_srcdir)/hash/hash_func.c
-	$(CC) $(CFLAGS) -c -o hash_func.o $(top_srcdir)/hash/hash_func.c
+	$(CC) $(ALL_CFLAGS) -c -o hash_func.o $(top_srcdir)/hash/hash_func.c
 hash_log2.o: $(top_srcdir)/hash/hash_log2.c
-	$(CC) $(CFLAGS) -c -o hash_log2.o $(top_srcdir)/hash/hash_log2.c
+	$(CC) $(ALL_CFLAGS) -c -o hash_log2.o $(top_srcdir)/hash/hash_log2.c
 hash_page.o: $(top_srcdir)/hash/hash_page.c
-	$(CC) $(CFLAGS) -c -o hash_page.o $(top_srcdir)/hash/hash_page.c
+	$(CC) $(ALL_CFLAGS) -c -o hash_page.o $(top_srcdir)/hash/hash_page.c
 hsearch.o: $(top_srcdir)/hash/hsearch.c
-	$(CC) $(CFLAGS) -c -o hsearch.o $(top_srcdir)/hash/hsearch.c
+	$(CC) $(ALL_CFLAGS) -c -o hsearch.o $(top_srcdir)/hash/hsearch.c
 dbm.o: $(top_srcdir)/hash/dbm.c
-	$(CC) $(CFLAGS) -c -o dbm.o $(top_srcdir)/hash/dbm.c
+	$(CC) $(ALL_CFLAGS) -c -o dbm.o $(top_srcdir)/hash/dbm.c
 
 bt_close.o: $(top_srcdir)/btree/bt_close.c
-	$(CC) $(CFLAGS) -c -o bt_close.o $(top_srcdir)/btree/bt_close.c
+	$(CC) $(ALL_CFLAGS) -c -o bt_close.o $(top_srcdir)/btree/bt_close.c
 bt_conv.o: $(top_srcdir)/btree/bt_conv.c
-	$(CC) $(CFLAGS) -c -o bt_conv.o $(top_srcdir)/btree/bt_conv.c
+	$(CC) $(ALL_CFLAGS) -c -o bt_conv.o $(top_srcdir)/btree/bt_conv.c
 bt_debug.o: $(top_srcdir)/btree/bt_debug.c
-	$(CC) $(CFLAGS) -c -o bt_debug.o $(top_srcdir)/btree/bt_debug.c
+	$(CC) $(ALL_CFLAGS) -c -o bt_debug.o $(top_srcdir)/btree/bt_debug.c
 bt_delete.o: $(top_srcdir)/btree/bt_delete.c
-	$(CC) $(CFLAGS) -c -o bt_delete.o $(top_srcdir)/btree/bt_delete.c
+	$(CC) $(ALL_CFLAGS) -c -o bt_delete.o $(top_srcdir)/btree/bt_delete.c
 bt_get.o: $(top_srcdir)/btree/bt_get.c
-	$(CC) $(CFLAGS) -c -o bt_get.o $(top_srcdir)/btree/bt_get.c
+	$(CC) $(ALL_CFLAGS) -c -o bt_get.o $(top_srcdir)/btree/bt_get.c
 bt_open.o: $(top_srcdir)/btree/bt_open.c
-	$(CC) $(CFLAGS) -c -o bt_open.o $(top_srcdir)/btree/bt_open.c
+	$(CC) $(ALL_CFLAGS) -c -o bt_open.o $(top_srcdir)/btree/bt_open.c
 bt_overflow.o: $(top_srcdir)/btree/bt_overflow.c
-	$(CC) $(CFLAGS) -c -o bt_overflow.o $(top_srcdir)/btree/bt_overflow.c
+	$(CC) $(ALL_CFLAGS) -c -o bt_overflow.o $(top_srcdir)/btree/bt_overflow.c
 bt_page.o: $(top_srcdir)/btree/bt_page.c
-	$(CC) $(CFLAGS) -c -o bt_page.o $(top_srcdir)/btree/bt_page.c
+	$(CC) $(ALL_CFLAGS) -c -o bt_page.o $(top_srcdir)/btree/bt_page.c
 bt_put.o: $(top_srcdir)/btree/bt_put.c
-	$(CC) $(CFLAGS) -c -o bt_put.o $(top_srcdir)/btree/bt_put.c
+	$(CC) $(ALL_CFLAGS) -c -o bt_put.o $(top_srcdir)/btree/bt_put.c
 bt_search.o: $(top_srcdir)/btree/bt_search.c
-	$(CC) $(CFLAGS) -c -o bt_search.o $(top_srcdir)/btree/bt_search.c
+	$(CC) $(ALL_CFLAGS) -c -o bt_search.o $(top_srcdir)/btree/bt_search.c
 bt_seq.o: $(top_srcdir)/btree/bt_seq.c
-	$(CC) $(CFLAGS) -c -o bt_seq.o $(top_srcdir)/btree/bt_seq.c
+	$(CC) $(ALL_CFLAGS) -c -o bt_seq.o $(top_srcdir)/btree/bt_seq.c
 bt_split.o: $(top_srcdir)/btree/bt_split.c
-	$(CC) $(CFLAGS) -c -o bt_split.o $(top_srcdir)/btree/bt_split.c
+	$(CC) $(ALL_CFLAGS) -c -o bt_split.o $(top_srcdir)/btree/bt_split.c
 bt_stack.o: $(top_srcdir)/btree/bt_stack.c
-	$(CC) $(CFLAGS) -c -o bt_stack.o $(top_srcdir)/btree/bt_stack.c
+	$(CC) $(ALL_CFLAGS) -c -o bt_stack.o $(top_srcdir)/btree/bt_stack.c
 bt_utils.o: $(top_srcdir)/btree/bt_utils.c
-	$(CC) $(CFLAGS) -c -o bt_utils.o $(top_srcdir)/btree/bt_utils.c
+	$(CC) $(ALL_CFLAGS) -c -o bt_utils.o $(top_srcdir)/btree/bt_utils.c
 
 rec_close.o: $(top_srcdir)/recno/rec_close.c
-	$(CC) $(CFLAGS) -c -o rec_close.o $(top_srcdir)/recno/rec_close.c
+	$(CC) $(ALL_CFLAGS) -c -o rec_close.o $(top_srcdir)/recno/rec_close.c
 rec_delete.o: $(top_srcdir)/recno/rec_delete.c
-	$(CC) $(CFLAGS) -c -o rec_delete.o $(top_srcdir)/recno/rec_delete.c
+	$(CC) $(ALL_CFLAGS) -c -o rec_delete.o $(top_srcdir)/recno/rec_delete.c
 rec_get.o: $(top_srcdir)/recno/rec_get.c
-	$(CC) $(CFLAGS) -c -o rec_get.o $(top_srcdir)/recno/rec_get.c
+	$(CC) $(ALL_CFLAGS) -c -o rec_get.o $(top_srcdir)/recno/rec_get.c
 rec_open.o: $(top_srcdir)/recno/rec_open.c
-	$(CC) $(CFLAGS) -c -o rec_open.o $(top_srcdir)/recno/rec_open.c
+	$(CC) $(ALL_CFLAGS) -c -o rec_open.o $(top_srcdir)/recno/rec_open.c
 rec_put.o: $(top_srcdir)/recno/rec_put.c
-	$(CC) $(CFLAGS) -c -o rec_put.o $(top_srcdir)/recno/rec_put.c
+	$(CC) $(ALL_CFLAGS) -c -o rec_put.o $(top_srcdir)/recno/rec_put.c
 rec_search.o: $(top_srcdir)/recno/rec_search.c
-	$(CC) $(CFLAGS) -c -o rec_search.o $(top_srcdir)/recno/rec_search.c
+	$(CC) $(ALL_CFLAGS) -c -o rec_search.o $(top_srcdir)/recno/rec_search.c
 rec_seq.o: $(top_srcdir)/recno/rec_seq.c
-	$(CC) $(CFLAGS) -c -o rec_seq.o $(top_srcdir)/recno/rec_seq.c
+	$(CC) $(ALL_CFLAGS) -c -o rec_seq.o $(top_srcdir)/recno/rec_seq.c
 rec_utils.o: $(top_srcdir)/recno/rec_utils.c
-	$(CC) $(CFLAGS) -c -o rec_utils.o $(top_srcdir)/recno/rec_utils.c
+	$(CC) $(ALL_CFLAGS) -c -o rec_utils.o $(top_srcdir)/recno/rec_utils.c
 
 dbtest.o: $(top_srcdir)/test/dbtest.c
-	$(CC) $(CFLAGS) -c -o dbtest.o $(top_srcdir)/test/dbtest.c
+	$(CC) $(ALL_CFLAGS) -c -o dbtest.o $(top_srcdir)/test/dbtest.c
 
 memmove.o: $(top_srcdir)/clib/memmove.c
-	$(CC) $(CFLAGS) -Dmemmove=my_memmove -DMEMMOVE -c -o memmove.o $(top_srcdir)/clib/memmove.c
+	$(CC) $(ALL_CFLAGS) -Dmemmove=my_memmove -DMEMMOVE -c -o memmove.o $(top_srcdir)/clib/memmove.c
 mkstemp.o: $(top_srcdir)/clib/mkstemp.c
-	$(CC) $(CFLAGS) -Dmkstemp=my_mkstemp -c -o mkstemp.o $(top_srcdir)/clib/mkstemp.c
+	$(CC) $(ALL_CFLAGS) -Dmkstemp=my_mkstemp -c -o mkstemp.o $(top_srcdir)/clib/mkstemp.c
 strerror.o: $(top_srcdir)/clib/strerror.c
-	$(CC) $(CFLAGS) -Dstrerror=my_strerror -c -o strerror.o $(top_srcdir)/clib/strerror.c
+	$(CC) $(ALL_CFLAGS) -Dstrerror=my_strerror -c -o strerror.o $(top_srcdir)/clib/strerror.c
 
 distclean:: clean
 	rm -f Makefile
diff --git a/src/util/dyn/Makefile.in b/src/util/dyn/Makefile.in
index 00315e3719..1215998cbf 100644
--- a/src/util/dyn/Makefile.in
+++ b/src/util/dyn/Makefile.in
@@ -4,7 +4,6 @@ mydir=util/dyn
 MY_SUBDIRS=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
 RELDIR=../util/dyn
-CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..
 ##DOSLIBNAME=libdyn.lib
diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index 7385943dfb..aa512ea1ec 100644
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -3,7 +3,6 @@ myfulldir=util/et
 mydir=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
 RELDIR=../util/et
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 SED = sed
 
 ##DOS##BUILDTOP = ..\..
@@ -28,7 +27,7 @@ LIBOBJS=$(OUTPRE)com_err.$(OBJEXT) \
 	$(OUTPRE)et_name.$(OBJEXT) \
 	$(OUTPRE)init_et.$(OBJEXT)
 # for et_lex.lex.c include in error_table.y
-LOCALINCLUDE=-I. -I$(srcdir)
+LOCALINCLUDES=-I. -I$(srcdir)
 
 FILES=	Makefile et_name.c error_message.c compile_et.c \
 		et_lex.lex.l error_table.y init_et.c \
@@ -72,7 +71,7 @@ error_table.c: et_lex.lex.c
 error_table.c: $(srcdir)/error_table.y
 
 error_table.o: error_table.c et_lex.lex.c
-	$(CC) $(CFLAGS) -c error_table.c
+	$(CC) $(ALL_CFLAGS) -c error_table.c
 
 et_lex.lex.o: et_lex.lex.c
 test1.o: test1.c
diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in
index 526684ccce..3955ca8cfa 100644
--- a/src/util/profile/Makefile.in
+++ b/src/util/profile/Makefile.in
@@ -8,9 +8,7 @@ PROG_RPATH=$(KRB5_LIBDIR)
 ##DOS##OBJFILE=$(OUTPRE)profile.lst
 ##DOS##LIBNAME=$(OUTPRE)profile.lib
 
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-
-LOCALINCLUDE=-I. -I$(srcdir)/../et
+LOCALINCLUDES=-I. -I$(srcdir)/../et
 
 STLIBOBJS = \
 	prof_tree.o \
diff --git a/src/util/pty/Makefile.in b/src/util/pty/Makefile.in
index 8f573d84e1..83d61dc63a 100644
--- a/src/util/pty/Makefile.in
+++ b/src/util/pty/Makefile.in
@@ -3,7 +3,6 @@ myfulldir=util/pty
 mydir=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
 RELDIR=../util/pty
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 
 SED = sed
 
@@ -20,7 +19,7 @@ STOBJLISTS=OBJS.ST
 INSTALLFILE = cp
 
 # for pty-int.h
-LOCALINCLUDE=-I. -I$(srcdir)
+LOCALINCLUDES=-I. -I$(srcdir)
 
 FILES= Makefile cleanup.c getpty.c init_slave.c open_ctty.c open_slave.c update_utmp.c update_wtmp.c vhangup.c void_assoc.c pty_err.h pty_err.c\
 logwtmp.c init.c
diff --git a/src/util/send-pr/Makefile.in b/src/util/send-pr/Makefile.in
index bafa045045..4168db767f 100644
--- a/src/util/send-pr/Makefile.in
+++ b/src/util/send-pr/Makefile.in
@@ -13,7 +13,8 @@ EMACS=emacs
 
 infodir = $(prefix)/info
 lispdir = $(prefix)/lib/emacs/site-lisp
-man1dir = $(KRB5MANROOT)/man1
+mandir  = $(KRB5MANROOT)
+man1dir = $(mandir)/man1
 datadir = @datadir@
 
 all:: send-pr  install-sid
diff --git a/src/util/ss/Makefile.in b/src/util/ss/Makefile.in
index 87f7e8e5b2..ce16e48d43 100644
--- a/src/util/ss/Makefile.in
+++ b/src/util/ss/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=.
 myfulldir=util/ss
 mydir=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 SED = sed
 
 INSTALLLIB=cp
@@ -26,8 +25,9 @@ install-unix:: install-libs
 
 # hard coded .. is so that ss/ss_err.h works
 # hard coded ../et is so com_err.h works
-# CFLAGS= -I${INCDIR} -I. -I.. -I../et -g
-LOCALINCLUDE= -I. -I$(srcdir)/ -I$(srcdir)/.. -I$(srcdir)/../et -I..
+# CFLAGS= -g
+# CPPFLAGS= -I${INCDIR} -I. -I.. -I../et
+LOCALINCLUDES= -I. -I$(srcdir)/ -I$(srcdir)/.. -I$(srcdir)/../et -I..
 
 # with ss_err.o first, ss_err.h should get rebuilt first too.  should not
 # be relying on this, though.
@@ -137,7 +137,7 @@ ct.tab.c ct.tab.h: ct.y
 # install_library_target(ss,$(OBJS),$(SRCS),)
 
 #mk_cmds: $(MKCMDSOBJS)
-#	$(CC) $(CFLAGS) -o $@ $(MKCMDSOBJS) $(LEXLIB) $(BSDLIB)
+#	$(CC) $(ALL_CFLAGS) -o $@ $(MKCMDSOBJS) $(LEXLIB) $(BSDLIB)
 #
 #mk_cmds.o:	ss_err.h
 #