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

diff --git a/src/Makefile.in b/src/Makefile.in
index 7aeab2075ab59d47ea4c7076c336db0be8e64430..8f8fc00901b62aee73fc1acbe8eb5c66291e36f5 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -4,7 +4,7 @@ mydir=.
 MY_SUBDIRS=util include lib @krb524@ kdc kadmin slave clients appl tests \
        config-files gen-manpages
 BUILDTOP=$(REL)$(C)
-CFLAGS = $(CCOPTS) $(DEFS)
+LOCALINCLUDES = -I$(srcdir) 
 
 ##DOS##BUILDTOP = .
 
@@ -56,9 +56,6 @@ install-mkdirs:
 # install::
 #      $(MAKE) $(MFLAGS) install.man
 
-.c.o:
-       $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
-
 TAGS: $(SRCS)
        etags $(SRCS)
 

diff --git a/src/appl/Makefile.in b/src/appl/Makefile.in
index d29642a6e7e792c73cb1feb4466b479d89079ab4..217aee5b37dc77a75a6866507b5ae17723fe43c5 100644 (file)
--- a/src/appl/Makefile.in
+++ b/src/appl/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=.
 myfulldir=appl
 mydir=.
 BUILDTOP=$(REL)$(U)
-CFLAGS = $(CCOPTS)
 
 MY_SUBDIRS= sample simple user_user bsd gss-sample gssftp telnet
 

diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in
index faeaff4c38828f84fcbbd4b2c8bedd6bf55d4dab..eee13ca90f56e378cb1d3fe92fcabf21aa2bab6d 100644 (file)
--- a/src/appl/bsd/Makefile.in
+++ b/src/appl/bsd/Makefile.in
@@ -2,8 +2,7 @@ thisconfigdir=.
 myfulldir=appl/bsd
 mydir=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(DEFINES)
-LOCALINCLUDE=@KRB4_INCLUDES@
+LOCALINCLUDES=@KRB4_INCLUDES@
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -28,7 +27,7 @@ RSH=  -DKRB5_PATH_RLOGIN=\"$(CLIENT_BINDIR)/rlogin\"
 BSD=   -DUCB_RLOGIN=\"$(UCB_RLOGIN)\" \
        -DUCB_RSH=\"$(UCB_RSH)\" -DUCB_RCP=\"$(UCB_RCP)\"
 
-DEFINES= $(RSH) $(BSD) $(RPROGS) \
+DEFINES = $(RSH) $(BSD) $(RPROGS) \
        -DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" -DKPROGDIR=\"$(CLIENT_BINDIR)\"
 
 all:: rsh rcp rlogin kshd klogind login.krb5 $(V4RCP)

diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in
index cb01396151e64aad63e4c924604f1f90357ad9a0..d564f7ed862c535a650adc70b76e9ef3c963a0c0 100644 (file)
--- a/src/appl/gss-sample/Makefile.in
+++ b/src/appl/gss-sample/Makefile.in
@@ -3,7 +3,7 @@ myfulldir=appl/gss-sample
 mydir=gss-sample
 MY_SUBDIRS=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -DUSE_AUTOCONF_H -DGSSAPI_V2
+DEFINES = -DUSE_AUTOCONF_H -DGSSAPI_V2
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 

diff --git a/src/appl/gssftp/Makefile.in b/src/appl/gssftp/Makefile.in
index e1f1ef91507f641c4c16ea3b00fcd2277b1a213d..b498b13d7a375f0b6e17e750ce2c9f200545e269 100644 (file)
--- a/src/appl/gssftp/Makefile.in
+++ b/src/appl/gssftp/Makefile.in
@@ -3,5 +3,4 @@ myfulldir=appl/gssftp
 mydir=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
 LOCAL_SUBDIRS=ftp ftpd
-CFLAGS = $(CCOPTS)
 LDFLAGS = -g

diff --git a/src/appl/gssftp/ftp/Makefile.in b/src/appl/gssftp/ftp/Makefile.in
index 73f7b3baaf708cecdf3597855307fa83259c634c..d9d98186399cd1ff827ce83e4fb9460f4ec09bf9 100644 (file)
--- a/src/appl/gssftp/ftp/Makefile.in
+++ b/src/appl/gssftp/ftp/Makefile.in
@@ -5,7 +5,7 @@ BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
 #
 # appl/gssftp/ftp/Makefile.in
 #
-CFLAGS = -DGSSAPI -DFTP_BUFSIZ=10240 $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
+DEFINES = -DGSSAPI -DFTP_BUFSIZ=10240
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -18,8 +18,7 @@ SRCS  = $(srcdir)/cmds.c $(srcdir)/cmdtab.c $(srcdir)/domacro.c \
 OBJS   = cmds.o cmdtab.o domacro.o ftp.o getpass.o glob.o main.o pclose.o \
          radix.o ruserpass.o secure.o
 
-LOCALINCLUDE = -I$(srcdir)/.. -I$(srcdir) @KRB4_INCLUDES@
-DEFINES = -DGSSAPI -DNOCONFIDENTIAL
+LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir) @KRB4_INCLUDES@
 
 all::  ftp
 

diff --git a/src/appl/gssftp/ftpd/Makefile.in b/src/appl/gssftp/ftpd/Makefile.in
index 98d11ec96f81248596f5fe6f801133a03ed318a5..eb66bbb6c5202620d171a5eb579a876760c4f144 100644 (file)
--- a/src/appl/gssftp/ftpd/Makefile.in
+++ b/src/appl/gssftp/ftpd/Makefile.in
@@ -5,7 +5,7 @@ BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
 #
 # appl/gssftp/ftpd/Makefile.in
 #
-CFLAGS = -DGSSAPI -DFTP_BUFSIZ=10240 $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
+DEFINES = -DGSSAPI -DFTP_BUFSIZ=10240 #-DNOCONFIDENTIAL
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -25,8 +25,7 @@ SRCS  = $(srcdir)/ftpd.c ftpcmd.c $(srcdir)/popen.c \
 OBJS   = ftpd.o ftpcmd.o glob.o popen.o vers.o radix.o \
          secure.o $(LIBOBJS) $(SETENVOBJ)
 
-LOCALINCLUDE = -I$(srcdir)/.. -I$(srcdir) @KRB4_INCLUDES@
-DEFINES = -DGSSAPI -DNOCONFIDENTIAL
+LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir) @KRB4_INCLUDES@
 
 all::  ftpd
 
@@ -53,17 +52,17 @@ ftpcmd.c: $(srcdir)/ftpcmd.y
        $(MV) y.tab.c ftpcmd.c
 
 glob.o: $(srcdir)/../ftp/glob.c
-       $(CC) -c $(CFLAGS) $(srcdir)/../ftp/glob.c
+       $(CC) -c $(ALL_CFLAGS) $(srcdir)/../ftp/glob.c
 radix.o: $(srcdir)/../ftp/radix.c
-       $(CC) -c $(CFLAGS) $(srcdir)/../ftp/radix.c
+       $(CC) -c $(ALL_CFLAGS) $(srcdir)/../ftp/radix.c
 secure.o: $(srcdir)/../ftp/secure.c
-       $(CC) -c $(CFLAGS) $(srcdir)/../ftp/secure.c
+       $(CC) -c $(ALL_CFLAGS) $(srcdir)/../ftp/secure.c
 
 getdtablesize.o: $(srcdir)/../../bsd/getdtablesize.c
-       $(CC) -c $(CFLAGS) $(srcdir)/../../bsd/getdtablesize.c
+       $(CC) -c $(ALL_CFLAGS) $(srcdir)/../../bsd/getdtablesize.c
 
 setenv.o: $(srcdir)/../../bsd/setenv.c
-       $(CC) -c $(CFLAGS) $(srcdir)/../../bsd/setenv.c
+       $(CC) -c $(ALL_CFLAGS) $(srcdir)/../../bsd/setenv.c
 
 
 ftpd.o: $(srcdir)/pathnames.h

diff --git a/src/appl/sample/Makefile.in b/src/appl/sample/Makefile.in
index 1678cad196f531be5cc123d123f4ef7b409b0274..e0c7ce53d742dbd7ee9324f40d0e2ce18ebf69d4 100644 (file)
--- a/src/appl/sample/Makefile.in
+++ b/src/appl/sample/Makefile.in
@@ -3,5 +3,3 @@ myfulldir=appl/sample
 mydir=sample
 MY_SUBDIRS = sclient sserver
 BUILDTOP=$(REL)$(U)$(S)$(U)
-
-CFLAGS = $(CCOPTS)

diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in
index 744a404c2081228bba4d64db408234af7a8d4e4d..cf286a4ae185e4deeb87f73f2eeee6c030cc2ae2 100644 (file)
--- a/src/appl/sample/sclient/Makefile.in
+++ b/src/appl/sample/sclient/Makefile.in
@@ -4,7 +4,6 @@ mydir=sample/sclient
 MY_SUBDIRS=.
 
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 

diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in
index 5e0b93ab76cda72e866e2abf2e134d43d5642e72..cf3a1517cc5f34f67c8b45305d6933bf6485eb2f 100644 (file)
--- a/src/appl/sample/sserver/Makefile.in
+++ b/src/appl/sample/sserver/Makefile.in
@@ -4,7 +4,6 @@ mydir=sample/sserver
 MY_SUBDIRS=.
 
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 

diff --git a/src/appl/simple/Makefile.in b/src/appl/simple/Makefile.in
index 0e46bef3677e4c4013df46902eaa6413c0e71295..1331664b9faf76d2ac71b804f03458e12c3ab5ef 100644 (file)
--- a/src/appl/simple/Makefile.in
+++ b/src/appl/simple/Makefile.in
@@ -3,5 +3,3 @@ myfulldir=appl/simple
 mydir=simple
 MY_SUBDIRS = client server
 BUILDTOP=$(REL)$(U)$(S)$(U)
-
-CFLAGS = $(CCOPTS)

diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in
index 023180d5d964f97ffd19a6ecad78b7fcb6038495..5ac73b9644e301dd627fe15ddd1733f27ae3ed8d 100644 (file)
--- a/src/appl/simple/client/Makefile.in
+++ b/src/appl/simple/client/Makefile.in
@@ -3,13 +3,12 @@ myfulldir=appl/simple/client
 mydir=simple/client
 MY_SUBDIRS=.
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
 all:: sim_client
 
-LOCALINCLUDE= -I.. -I$(srcdir)/..
+LOCALINCLUDES= -I.. -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 f0fb9d62e269b49bb5be9abee06693ecff9c5c0f..ade8d583b6e803503d666b8793419eebdfc06b04 100644 (file)
--- a/src/appl/simple/server/Makefile.in
+++ b/src/appl/simple/server/Makefile.in
@@ -3,9 +3,8 @@ myfulldir=appl/simple/server
 mydir=simple/server
 MY_SUBDIRS=.
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 
-LOCALINCLUDE= -I.. -I$(srcdir)/..
+LOCALINCLUDES= -I.. -I$(srcdir)/..
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)

diff --git a/src/appl/telnet/libtelnet/Makefile.in b/src/appl/telnet/libtelnet/Makefile.in
index 31d98b36b9365f11e801812daddba3f2307596f4..48bbe539a096cd1e1434a1cb879730af901411b8 100644 (file)
--- a/src/appl/telnet/libtelnet/Makefile.in
+++ b/src/appl/telnet/libtelnet/Makefile.in
@@ -26,7 +26,7 @@ BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
 AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DDES_ENCRYPTION -DKRB5 -DFORWARD \
        -UNO_LOGIN_F -DLOGIN_CAP_F -DLOGIN_PROGRAM=KRB5_PATH_LOGIN
 LOCALINCLUDES=-I.. -I$(srcdir)/.. @KRB4_INCLUDES@
-CFLAGS = $(CCOPTS) $(AUTH_DEF) $(DEFS) $(LOCALINCLUDES)
+DEFINES = $(AUTH_DEF)
 LIBOBJS=@LIBOBJS@
 
 LIB=    libtelnet.a

diff --git a/src/appl/telnet/telnet/Makefile.in b/src/appl/telnet/telnet/Makefile.in
index 3654e17f47a21ebce47e0e70b16ca8247881e5f2..a1fd6f51a2d663f9bf9fd73807b44a77a14a9a95 100644 (file)
--- a/src/appl/telnet/telnet/Makefile.in
+++ b/src/appl/telnet/telnet/Makefile.in
@@ -27,7 +27,7 @@ BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
 AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -DLOGIN_CAP_F -DLOGIN_PROGRAM=KRB5_PATH_LOGIN
 OTHERDEFS=-DLINEMODE -DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON
 LOCALINCLUDES=-I.. -I$(srcdir)/..
-CFLAGS = $(CCOPTS) $(AUTH_DEF) $(OTHERDEFS) $(DEFS) $(LOCALINCLUDES)
+DEFINES = $(AUTH_DEF) $(OTHERDEFS)
 ARPA_TELNET= $(srcdir)/../arpa/telnet.h
 
 PROG_LIBPATH=-L$(TOPLIBD)

diff --git a/src/appl/telnet/telnetd/Makefile.in b/src/appl/telnet/telnetd/Makefile.in
index 2fbec0e56f686d0473d9aece2dbad2f6b7c604a9..01bd66afde363ca81d494dc440fe6e4c61cd2dbe 100644 (file)
--- a/src/appl/telnet/telnetd/Makefile.in
+++ b/src/appl/telnet/telnetd/Makefile.in
@@ -27,7 +27,7 @@ BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
 AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=KRB5_PATH_LOGIN
 OTHERDEFS=-DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON
 LOCALINCLUDES=-I.. -I$(srcdir)/..
-CFLAGS = $(CCOPTS) $(AUTH_DEF) $(OTHERDEFS) $(DEFS) $(LOCALINCLUDES)
+DEFINES = $(AUTH_DEF) $(OTHERDEFS)
 ARPA_TELNET= $(srcdir)/../arpa/telnet.h
 
 PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)

diff --git a/src/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in
index 7721c224df7fa41a46deaf719cc0f23e9afdad63..5185da516e90d174ce14a104ede5a950896c308c 100644 (file)
--- a/src/appl/user_user/Makefile.in
+++ b/src/appl/user_user/Makefile.in
@@ -3,7 +3,7 @@ myfulldir=appl/user_user
 mydir=user_user
 MY_SUBDIRS=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) -DDEBUG
+DEFINES = -DDEBUG
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 

diff --git a/src/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in
index c569e42d2c3913a00867386d9903f4039929bd96..b09d3ff3b6b1102c848864ae2771a778bc6fc3ba 100644 (file)
--- a/src/clients/kdestroy/Makefile.in
+++ b/src/clients/kdestroy/Makefile.in
@@ -4,7 +4,6 @@ mydir=kdestroy
 BUILDTOP=$(REL)$(U)$(S)$(U)
 ##DOS##BUILDTOP=..\..
 
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -18,7 +17,8 @@ kdestroy: kdestroy.o $(KRB5_BASE_DEPLIBS)
 
 
 ##WIN32##INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5
-##WIN32##CFLAGS        = $(CCOPTS2) $(INCLUDES)
+##WIN32##CFLAGS = $(CCOPTS2)
+##WIN32##CPPFLAGS = $(INCLUDES)
 
 ##WIN32##all-windows:: $(OUTPRE)kdestroy.exe
 ##WIN32##$(OUTPRE)kdestroy.exe: $(OUTPRE)kdestroy.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.obj $(KLIB) $(CLIB)

diff --git a/src/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in
index cff0dc9db999c668290095ea12e3873e97d79521..6206e09bc02f7d02fc2954d3b189baa459901b08 100644 (file)
--- a/src/clients/kinit/Makefile.in
+++ b/src/clients/kinit/Makefile.in
@@ -4,7 +4,6 @@ mydir=kinit
 BUILDTOP=$(REL)$(U)$(S)$(U)
 ##DOS##BUILDTOP=..\..
 
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -17,7 +16,8 @@ kinit: kinit.o $(KRB5_BASE_DEPLIBS)
 
 
 ##WIN32##INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5
-##WIN32##CFLAGS        = $(CCOPTS2) $(INCLUDES)
+##WIN32##CFLAGS = $(CCOPTS2)
+##WIN32##CPPFLAGS = $(INCLUDES)
 
 ##WIN32##all-windows:: $(OUTPRE)kinit.exe
 ##WIN32##$(OUTPRE)kinit.exe: $(OUTPRE)kinit.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.obj $(KLIB) $(CLIB)

diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in
index 5c5af91db80e7a5b5a13dc680b9fc2212772a4cb..680388e0a12801f6c3ab284787813987ddd6f3e9 100644 (file)
--- a/src/clients/klist/Makefile.in
+++ b/src/clients/klist/Makefile.in
@@ -3,7 +3,6 @@ myfulldir=clients/klist
 mydir=klist
 BUILDTOP=$(REL)$(U)$(S)$(U)
 
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -17,7 +16,8 @@ klist: klist.o $(KRB5_BASE_DEPLIBS)
 
 
 ##WIN32##INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5
-##WIN32##CFLAGS        = $(CCOPTS2) $(INCLUDES)
+##WIN32##CFLAGS = $(CCOPTS2)
+##WIN32##CPPFLAGS = $(INCLUDES)
 
 ##WIN32##all-windows:: $(OUTPRE)klist.exe
 ##WIN32##$(OUTPRE)klist.exe: $(OUTPRE)klist.obj $(KLIB) $(CLIB)

diff --git a/src/clients/kpasswd/Makefile.in b/src/clients/kpasswd/Makefile.in
index dddc05b9542bc81731ee0b32cbb93cc1cc66890c..4aae2e0fc35f8291db0e3554d6d1ab74db0da9b1 100644 (file)
--- a/src/clients/kpasswd/Makefile.in
+++ b/src/clients/kpasswd/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./..
 myfulldir=clients/kpasswd
 mydir=kpasswd
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -23,7 +22,8 @@ install-all install-kdc install-server install-client install-unix::
        $(INSTALL_DATA) $(srcdir)/kpasswd.M $(DESTDIR)$(CLIENT_MANDIR)/`echo kpasswd|sed '$(transform)'`.1;
 
 ##WIN32##INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5
-##WIN32##CFLAGS        = $(CCOPTS2) $(INCLUDES)
+##WIN32##CFLAGS = $(CCOPTS2)
+##WIN32##CPPFLAGS = $(INCLUDES)
 
 ##WIN32##all-windows:: $(OUTPRE)kpasswd.exe
 ##WIN32##$(OUTPRE)kpasswd.exe: $(OUTPRE)kpasswd.obj $(KLIB) $(CLIB)

diff --git a/src/clients/ksu/Makefile.in b/src/clients/ksu/Makefile.in
index b31a3f64138ef33d754fc3d10d466de367c11fb1..8d25ee653261794de666bfed6a13d28880e34ab8 100644 (file)
--- a/src/clients/ksu/Makefile.in
+++ b/src/clients/ksu/Makefile.in
@@ -3,7 +3,6 @@ myfulldir=clients/ksu
 mydir=ksu
 BUILDTOP=$(REL)$(U)$(S)$(U)
 DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"'
-CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE)
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)

diff --git a/src/clients/kvno/Makefile.in b/src/clients/kvno/Makefile.in
index 080e75af95c1563fd7dba13ffdaf6b70a58fd458..fdd4716b5c21a56f62c8c43b69aa18749d28b520 100644 (file)
--- a/src/clients/kvno/Makefile.in
+++ b/src/clients/kvno/Makefile.in
@@ -4,7 +4,6 @@ mydir=kvno
 BUILDTOP=$(REL)$(U)$(S)$(U)
 ##DOS##BUILDTOP=..\..
 
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -17,7 +16,8 @@ kvno: kvno.o $(KRB5_BASE_DEPLIBS)
 
 
 ##WIN32##INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5
-##WIN32##CFLAGS        = $(CCOPTS2) $(INCLUDES)
+##WIN32##CFLAGS        = $(CCOPTS2)
+##WIN32##CPPFLAGS = $(INCLUDES)
 
 ##WIN32##all-windows:: kvno.exe
 ##WIN32##kvno.exe: kvno.obj $(BUILDTOP)\util\windows\getopt.obj $(KLIB) $(CLIB)

diff --git a/src/config/libobj.in b/src/config/libobj.in
index e2cf59572d0413bd84cdee09e05705ef7dc48434..f8af821c0f6208bd20e91b85748a4f9f214c6cfa 100644 (file)
--- a/src/config/libobj.in
+++ b/src/config/libobj.in
@@ -27,14 +27,12 @@ SONAME=@SONAME@
 #
 PICFLAGS=@PICFLAGS@
 PROFFLAGS=@PROFFLAGS@
-.SUFFIXES: .c .o .so .po
-.c.o:
-       $(CC) $(CFLAGS) -c $<
+.SUFFIXES: .c .so .po
 .c.so:
-       $(CC) $(PICFLAGS) $(CFLAGS) -c $< -o $*.so.o && \
+       $(CC) $(DEFS) $(DEFINES) $(LOCALINCLUDES) $(PICFLAGS) $(CPPFLAGS) -c $< -o $*.so.o && \
                $(MV) $*.so.o $*.so
 .c.po:
-       $(CC) $(PROFFLAGS) $(CFLAGS) -c $< -o $*.po.o && \
+       $(CC) $(DEFS) $(DEFINES) $(LOCALINCLUDES) $(PROFFLAGS) $(CPPFLAGS) -c $< -o $*.po.o && \
                $(MV) $*.po.o $*.po
 
 # rules to generate object file lists

diff --git a/src/config/post.in b/src/config/post.in
index 6a318288a42f6a77d6a21827d6659ddebb3a1466..79b734baeb1bc5b87ae04c058e5d7d087aef9695 100644 (file)
--- a/src/config/post.in
+++ b/src/config/post.in
@@ -4,7 +4,7 @@ check-windows::
 
 .depend: $(SRCS) $(SRCTOP)/util/depfix.sed
        if test -n "$(SRCS)" ; then \
-               $(CC) -M $(CFLAGS) $(SRCS) | \
+               $(CC) -M $(ALL_CFLAGS) $(SRCS) | \
                        sed -f $(SRCTOP)/util/depfix.sed | \
                        sed -e 's; $(SRCTOP)/; $$(SRCTOP)/;g' | \
                        sed -e 's; $(srcdir)/; $$(srcdir)/;g' | \

diff --git a/src/config/pre.in b/src/config/pre.in
index b8d565ffdd1ccd0e2c4987774413f6b0a2644cd1..45fb6d9ad10b92bca26922c0c76cc8663e21ceb5 100644 (file)
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -70,11 +70,12 @@ SRCTOP = @srcdir@/$(BUILDTOP)
 VPATH = @srcdir@
 CONFIG_RELTOPDIR = @CONFIG_RELTOPDIR@
 
+ALL_CFLAGS = $(DEFS) $(DEFINES) $(LOCALINCLUDES) $(CPPFLAGS) $(CFLAGS)
+CFLAGS = @CCOPTS@
 CPPFLAGS = @CPPFLAGS@
-DEFS = @DEFS@ $(CPPFLAGS)
+DEFS = @DEFS@
 CC = @CC@
 LD = $(PURE) @LD@
-CCOPTS = @CCOPTS@
 DEPLIBS = @DEPLIBS@
 LDFLAGS = @LDFLAGS@
 LD_UNRESOLVED_PREFIX = @LD_UNRESOLVED_PREFIX@
@@ -284,6 +285,12 @@ COMPILE_ET_C= $(AWK) -f $(SRCTOP)/util/et/et_c.awk outfile=$@
 .et.c:
        $(AWK) -f $(SRCTOP)/util/et/et_c.awk outfile=$*.c $<
 
+# rule to make object files
+#
+.SUFFIXES: .c .o
+.c.o:
+       $(CC) $(ALL_CFLAGS) -c $<
+
 # ss command table rules
 #
 MAKE_COMMANDS= $(BUILDTOP)/util/ss/mk_cmds

diff --git a/src/kadmin/Makefile.in b/src/kadmin/Makefile.in
index 23f81b7166778862addc5626d51908565a6e1a49..749b6c14cf10fe9000df05d04dd6a56b099eee91 100644 (file)
--- a/src/kadmin/Makefile.in
+++ b/src/kadmin/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=.
 myfulldir=kadmin
 mydir=.
 BUILDTOP=$(REL)$(U)
-CFLAGS = $(CCOPTS)
 LOCAL_SUBDIRS = cli dbutil passwd ktutil server @V4SERVER@ v5passwdd testing
 
 all::

diff --git a/src/kadmin/cli/Makefile.in b/src/kadmin/cli/Makefile.in
index 3654c78a626fb8a158706abf54e3783e8c5802e9..5d8bbc53160bfc4061a33f0d1f99d3d3443bfa9b 100644 (file)
--- a/src/kadmin/cli/Makefile.in
+++ b/src/kadmin/cli/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./..
 myfulldir=kadmin/cli
 mydir=cli
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -32,4 +31,4 @@ clean-unix::
 
 # for testing getdate.y
 datetest: getdate.c
-       $(CC) -o datetest $(CFLAGS) $(LDFLAGS) $(LDARGS) -DTEST getdate.c
+       $(CC) -o datetest $(ALL_CFLAGS) $(LDFLAGS) $(LDARGS) -DTEST getdate.c

diff --git a/src/kadmin/dbutil/Makefile.in b/src/kadmin/dbutil/Makefile.in
index 7567d76cdd7fb9e21658423a5f6fc070fb8fe359..8f6e20d2967da67def090bf81d5577c5102a5efa 100644 (file)
--- a/src/kadmin/dbutil/Makefile.in
+++ b/src/kadmin/dbutil/Makefile.in
@@ -2,7 +2,8 @@ thisconfigdir=./..
 myfulldir=kadmin/dbutil
 mydir=dbutil
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) -DKDB4_DISABLE -I. $(LOCALINCLUDE) @KRB4_INCLUDES@ 
+DEFINES = -DKDB4_DISABLE
+LOCALINCLUDES = -I. @KRB4_INCLUDES@ 
 PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
 PROG_RPATH=$(KRB5_LIBDIR)
 

diff --git a/src/kadmin/kdbkeys/Makefile.in b/src/kadmin/kdbkeys/Makefile.in
index aeda38f05a178ddafd8dd882bb4d78ef7c13474e..139d4d234cd8c8b989bfdf1a54309ca9aea3c4bf 100644 (file)
--- a/src/kadmin/kdbkeys/Makefile.in
+++ b/src/kadmin/kdbkeys/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=.
 myfulldir=kadmin/kdbkeys
 mydir=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 
 PROG = kdbkeys
 OBJS = kdbkeys.o

diff --git a/src/kadmin/ktutil/Makefile.in b/src/kadmin/ktutil/Makefile.in
index b04307864c06347dd38865309e71a4ddf5af6982..e0436182a0b72684408a7402e624c9e061737e87 100644 (file)
--- a/src/kadmin/ktutil/Makefile.in
+++ b/src/kadmin/ktutil/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./..
 myfulldir=kadmin/ktutil
 mydir=ktutil
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) $(KRB4_INCLUDES)
+LOCALINCLUDES = $(KRB4_INCLUDES)
 PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
 PROG_RPATH=$(KRB5_LIBDIR)
 

diff --git a/src/kadmin/passwd/Makefile.in b/src/kadmin/passwd/Makefile.in
index 98cf83b3cad6adb05855fa83a122cc18b6bfc83c..39d0830cea32d4a4d8a2e0426de6de317e34dd92 100644 (file)
--- a/src/kadmin/passwd/Makefile.in
+++ b/src/kadmin/passwd/Makefile.in
@@ -2,7 +2,8 @@ thisconfigdir=./..
 myfulldir=kadmin/passwd
 mydir=passwd
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -I. -DUSE_KADM5_API_VERSION=1
+LOCALINCLUDES = -I.
+DEFINES = -DUSE_KADM5_API_VERSION=1
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 LOCAL_SUBDIRS = unit-test

diff --git a/src/kadmin/server/Makefile.in b/src/kadmin/server/Makefile.in
index 73029d4b3a93e877322614b208e7b907a21ab9ec..8728a1f9a80e775d24274095006cc3e1dd992bcf 100644 (file)
--- a/src/kadmin/server/Makefile.in
+++ b/src/kadmin/server/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./..
 myfulldir=kadmin/server
 mydir=server
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)

diff --git a/src/kadmin/testing/Makefile.in b/src/kadmin/testing/Makefile.in
index c189bf887f818374cf7e812f133ecf4baf7404eb..be5b5a8d29cfaab807184089f9cf51147ca6505e 100644 (file)
--- a/src/kadmin/testing/Makefile.in
+++ b/src/kadmin/testing/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./..
 myfulldir=kadmin/testing
 mydir=testing
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS)
 LOCAL_SUBDIRS = scripts util
 
 all::

diff --git a/src/kadmin/testing/util/Makefile.in b/src/kadmin/testing/util/Makefile.in
index 43d933435fe462cf85eea66dcf1cfa5dbb4d57e6..23725434713d872425ccdab2a7bde7c28fca6a12 100644 (file)
--- a/src/kadmin/testing/util/Makefile.in
+++ b/src/kadmin/testing/util/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./../..
 myfulldir=kadmin/testing/util
 mydir=testing/util
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(TCL_INCLUDES)
+LOCALINCLUDES = $(TCL_INCLUDES)
 
 PROG_LIBPATH=-L$(TOPLIBD) $(TCL_LIBPATH)
 PROG_RPATH=$(KRB5_LIBDIR)$(TCL_RPATH)

diff --git a/src/kadmin/v4server/Makefile.in b/src/kadmin/v4server/Makefile.in
index f7ff7affd2515fd9e460746f3851ba5284e9c5e3..43b19e137eabfa1ee1ab4948a8dacb4e0df00cf8 100644 (file)
--- a/src/kadmin/v4server/Makefile.in
+++ b/src/kadmin/v4server/Makefile.in
@@ -2,15 +2,14 @@ thisconfigdir=./..
 myfulldir=kadmin/v4server
 mydir=v4server
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) \
-       -DKADM5 -DNEED_SOCKETS @HESIOD_DEFS@
+DEFINES = -DKADM5 -DNEED_SOCKETS @HESIOD_DEFS@
 PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
 PROG_RPATH=$(KRB5_LIBDIR)
 LOCAL_SUBDIRS = unit-test
 
 HESIOD_LIBS=@HESIOD_LIBS@
 
-LOCALINCLUDE = $(KRB4_INCLUDES) -I. -I$(srcdir)
+LOCALINCLUDES = $(KRB4_INCLUDES) -I. -I$(srcdir)
 
 PROG = kadmind4
 OBJS = kadm_server.o admin_server.o kadm_ser_wrap.o \

diff --git a/src/kadmin/v5passwdd/Makefile.in b/src/kadmin/v5passwdd/Makefile.in
index 9b189d41b96f7250329768dc8be277d52f51bda4..853237030a37f9b78fc286c10d8b722c2e97f1ee 100644 (file)
--- a/src/kadmin/v5passwdd/Makefile.in
+++ b/src/kadmin/v5passwdd/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./..
 myfulldir=kadmin/v5passwdd
 mydir=v5passwdd
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 

diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
index b23d8ab0bc2774b54ec1f9396fde3cae38257b22..58b0e4f08a14d8128030fbe3fff699aca8bce170 100644 (file)
--- a/src/kdc/Makefile.in
+++ b/src/kdc/Makefile.in
@@ -6,7 +6,7 @@ BUILDTOP=$(REL)$(U)
 # -DNOCACHE    - disable lookaside cache, which is used to resend previous
 #                response to replay (i.e., *don't* define this if you
 #                define USE_RCACHE)
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -DNOCACHE
+DEFINES = -DNOCACHE
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
 PROG_RPATH=$(KRB5_LIBDIR)
@@ -15,7 +15,7 @@ all:: krb5kdc rtest
 
 # DEFINES = -DBACKWARD_COMPAT $(KRB4DEF)
 
-LOCALINCLUDE = @KRB4_INCLUDES@ -I.
+LOCALINCLUDES = @KRB4_INCLUDES@ -I.
 SRCS= \
        kdc5_err.c \
        $(srcdir)/dispatch.c \

diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in
index 190a1a623f9fd4b2f5376008b1f371d80c069e94..d64c3eb385ae4862bcb7e8c51144ffad906daf4d 100644 (file)
--- a/src/krb524/Makefile.in
+++ b/src/krb524/Makefile.in
@@ -29,13 +29,13 @@ LIBMINOR=0
 RELDIR=../krb524
 STOBJLISTS=OBJS.ST
 
-CFLAGS = $(CCOPTS) -DUSE_MASTER  $(DEFS) $(LOCALINCLUDE)
+DEFINES = -DUSE_MASTER
 PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
 PROG_RPATH=$(KRB5_LIBDIR)
 KRB524_DEPLIB  = libkrb524.a
 KRB524_LIB     = libkrb524.a
 
-LOCALINCLUDE= $(KRB4_INCLUDES) -I. -I$(srcdir)
+LOCALINCLUDES= $(KRB4_INCLUDES) -I. -I$(srcdir)
 
 # Library sources
 SRCS   = conv_creds.c conv_princ.c cnv_tkt_skey.c \

diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 8f053e4d1ce94e2bd5c792108a9caebc2f58732c..aee2bed2e382f5fb3931d93177fe50182035bca2 100644 (file)
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -3,7 +3,6 @@ myfulldir=lib
 mydir=lib
 MY_SUBDIRS=crypto krb5 des425 @KRB4@ krb5util kdb gssapi rpc kadm5
 BUILDTOP=$(REL)$(U)
-CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..
 ##DOS##VERS_DIR = \vers
@@ -136,15 +135,15 @@ RCFLAGS=$(CPPFLAGS) -D_WIN32 -D_MSDOS_ -DRES_ONLY
 ##MIT##lib-windows:: $(SKLIB) $(SGLIB) 
 
 $(K5_GLUE): win_glue.c
-       $(CC) $(CFLAGS) $(MITFLAGS) /c /DKRB5=1 /Fo$@ $**
+       $(CC) $(ALL_CFLAGS) $(MITFLAGS) /c /DKRB5=1 /Fo$@ $**
 $(SAP_GLUE): win_glue.c
-       $(CC) $(CFLAGS) $(MITFLAGS) /DSAP_VERSERV=1 /DKRB5=1 /c /Fo$@ $**
+       $(CC) $(ALL_CFLAGS) $(MITFLAGS) /DSAP_VERSERV=1 /DKRB5=1 /c /Fo$@ $**
 $(K4_GLUE): win_glue.c
-       $(CC) $(CFLAGS) /c /DKRB4=1 /Fo$@ $**
+       $(CC) $(ALL_CFLAGS) /c /DKRB4=1 /Fo$@ $**
 $(GSS_GLUE): win_glue.c
-       $(CC) $(CFLAGS) /c /DGSSAPI=1 /Fo$@ $**
+       $(CC) $(ALL_CFLAGS) /c /DGSSAPI=1 /Fo$@ $**
 $(NO_GLUE): win_glue.c
-       $(CC) $(CFLAGS) /c /Fo$@ $**
+       $(CC) $(ALL_CFLAGS) /c /Fo$@ $**
 
 # Build Convenience
 comerr.lib: $(CLIB)

diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index 27956feea47520b9a66c300430667aefdd7aa56e..d86325bf824c79fb3f7ddb799d865f39e4c70a2d 100644 (file)
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -4,7 +4,7 @@ mydir=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
 LOCAL_SUBDIRS=crc32 des dk enc_provider hash_provider keyhash_provider \
        md4 md5 old raw sha1
-CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/enc_provider \
+LOCALINCLUDES = -I$(srcdir)/enc_provider \
        -I$(srcdir)/hash_provider -I$(srcdir)/keyhash_provider \
        -I$(srcdir)/old -I$(srcdir)/raw -I$(srcdir)/dk
 

diff --git a/src/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in
index 03dbc1519aecf4fcf8495a9bbc7fec8c115db8a4..7136a386ad9fbeec312f9e23e4652fdf0cdc66c6 100644 (file)
--- a/src/lib/crypto/crc32/Makefile.in
+++ b/src/lib/crypto/crc32/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./..
 myfulldir=lib/crypto/crc32
 mydir=crc32
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=crc32

diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in
index 3e25c47238aced6592431a285c8e72649f4e8d64..2634584f7283db58f94fcc9428e5de2ba80e36f5 100644 (file)
--- a/src/lib/crypto/des/Makefile.in
+++ b/src/lib/crypto/des/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./..
 myfulldir=lib/crypto/des
 mydir=des
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=des

diff --git a/src/lib/crypto/dk/Makefile.in b/src/lib/crypto/dk/Makefile.in
index 88c3ad31cab9f78188c181d67e263e56180b3c78..2b4b14afc6c8d341d4c41a2319cb05be9ada1b74 100644 (file)
--- a/src/lib/crypto/dk/Makefile.in
+++ b/src/lib/crypto/dk/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./..
 myfulldir=lib/crypto/dk
 mydir=dk
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/..
+LOCALINCLUDES = -I$(srcdir)/..
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=dk

diff --git a/src/lib/crypto/enc_provider/Makefile.in b/src/lib/crypto/enc_provider/Makefile.in
index f757bf66ac3785def1ddc6263fd05d5e4512b907..e0672a21936836b06747171924378fabfdf6ca0b 100644 (file)
--- a/src/lib/crypto/enc_provider/Makefile.in
+++ b/src/lib/crypto/enc_provider/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./..
 myfulldir=lib/crypto/enc_provider
 mydir=enc_provider
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des
+LOCALINCLUDES = -I$(srcdir)/../des
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=enc_provider

diff --git a/src/lib/crypto/hash_provider/Makefile.in b/src/lib/crypto/hash_provider/Makefile.in
index 1b2c988c52e7e79b5fe59efd3a11a5a4e37a416a..e5ba5cce74d1a0d189e5ce1f041e403e427de4af 100644 (file)
--- a/src/lib/crypto/hash_provider/Makefile.in
+++ b/src/lib/crypto/hash_provider/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./..
 myfulldir=lib/crypto/hash_provider
 mydir=hash_provider
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../crc32 -I$(srcdir)/../md4 \
+LOCALINCLUDES = -I$(srcdir)/../crc32 -I$(srcdir)/../md4 \
        -I$(srcdir)/../md5 -I$(srcdir)/../sha1
 
 ##DOS##BUILDTOP = ..\..\..

diff --git a/src/lib/crypto/keyhash_provider/Makefile.in b/src/lib/crypto/keyhash_provider/Makefile.in
index a9317a9b559b35829159a33f701313e25d30a2b9..50c9d352f71b1e086968980a66c97d2b344c07fc 100644 (file)
--- a/src/lib/crypto/keyhash_provider/Makefile.in
+++ b/src/lib/crypto/keyhash_provider/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./..
 myfulldir=lib/crypto/keyhash_provider
 mydir=keyhash_provider
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des -I$(srcdir)/../md4 \
+LOCALINCLUDES = -I$(srcdir)/../des -I$(srcdir)/../md4 \
        -I$(srcdir)/../md5
 
 ##DOS##BUILDTOP = ..\..\..
@@ -30,10 +30,10 @@ includes:: depend
 depend:: $(SRCS)
 
 t_cksum4.o: $(srcdir)/t_cksum.c
-       $(CC) -DMD=4 $(CFLAGS) -o t_cksum4.o -c $(srcdir)/t_cksum.c
+       $(CC) -DMD=4 $(ALL_CFLAGS) -o t_cksum4.o -c $(srcdir)/t_cksum.c
 
 t_cksum5.o: $(srcdir)/t_cksum.c
-       $(CC) -DMD=5 $(CFLAGS) -o t_cksum5.o -c $(srcdir)/t_cksum.c
+       $(CC) -DMD=5 $(ALL_CFLAGS) -o t_cksum5.o -c $(srcdir)/t_cksum.c
 
 t_cksum4: t_cksum4.o $(KRB5_BASE_DEPLIBS)
        $(CC_LINK) -o t_cksum4 t_cksum4.o $(KRB5_BASE_LIBS)

diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in
index ba212a73aca0828024a93912cb8c7f04fc8c82db..f5c7d261fda593feb21ef9089455beaf69c7d592 100644 (file)
--- a/src/lib/crypto/md4/Makefile.in
+++ b/src/lib/crypto/md4/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./..
 myfulldir=lib/crypto/md4
 mydir=md4
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS)  -I$(srcdir)
+LOCALINCLUDES = -I$(srcdir)
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=md4
@@ -32,13 +32,13 @@ t_mddriver.c: $(srcdir)/../md5/t_mddriver.c
        $(CP) $(srcdir)/../md5/t_mddriver.c t_mddriver.c
 
 t_mddriver.o: t_mddriver.c
-       $(CC) -DMD=4 $(CFLAGS) -c  t_mddriver.c
+       $(CC) -DMD=4 $(ALL_CFLAGS) -c  t_mddriver.c
 
 t_mddriver: t_mddriver.o md4.o
-       $(CC) $(CFLAGS) -o t_mddriver t_mddriver.o md4.o
+       $(CC) $(ALL_CFLAGS) -o t_mddriver t_mddriver.o md4.o
 
 $(OUTPRE)t_mddriver.obj: t_mddriver.c
-       $(CC) -DMD=4 $(CFLAGS) -Fo$@ -c $**
+       $(CC) -DMD=4 $(ALL_CFLAGS) -Fo$@ -c $**
 
 $(OUTPRE)t_mddriver.exe: $(OUTPRE)t_mddriver.obj $(OUTPRE)md4.obj
        link -out:$@ $**

diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in
index 896de961e1d3c71ac2b84c8b12c2c5ed6d4f5698..98d0b310510bd3307d57af643703bab77f33a6ff 100644 (file)
--- a/src/lib/crypto/md5/Makefile.in
+++ b/src/lib/crypto/md5/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./..
 myfulldir=lib/crypto/md5
 mydir=md5
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=md5
@@ -29,7 +28,7 @@ includes:: depend
 depend:: $(SRCS)
 
 t_mddriver: t_mddriver.o md5.o
-       $(CC) $(CFLAGS) $(LDFLAGS) -o t_mddriver t_mddriver.o md5.o
+       $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o t_mddriver t_mddriver.o md5.o
 
 $(OUTPRE)t_mddriver.exe: $(OUTPRE)t_mddriver.obj $(OUTPRE)md5.obj
        link -out:$@ $**

diff --git a/src/lib/crypto/old/Makefile.in b/src/lib/crypto/old/Makefile.in
index f808ed66b231f58d27a1364fa9e42920d5cf83e0..cab1b3511916e0c3474c7b784800ddc466083e4d 100644 (file)
--- a/src/lib/crypto/old/Makefile.in
+++ b/src/lib/crypto/old/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./..
 myfulldir=lib/crypto/old
 mydir=old
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des
+LOCALINCLUDES = -I$(srcdir)/../des
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=old

diff --git a/src/lib/crypto/raw/Makefile.in b/src/lib/crypto/raw/Makefile.in
index 427bb6b4eda967c90643d44ffe14256281c8799b..e3ca3c673d50c13aa3f9271041305c08d8619ed2 100644 (file)
--- a/src/lib/crypto/raw/Makefile.in
+++ b/src/lib/crypto/raw/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./..
 myfulldir=lib/crypto/raw
 mydir=raw
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=raw

diff --git a/src/lib/crypto/sha1/Makefile.in b/src/lib/crypto/sha1/Makefile.in
index 2f8cea108078734fa3fb224a072f8e9b15e0e31e..5d1b69c4f9e7a6c2207243f57472b6eb7f61c397 100644 (file)
--- a/src/lib/crypto/sha1/Makefile.in
+++ b/src/lib/crypto/sha1/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./..
 myfulldir=lib/crypto/sha1
 mydir=sha1
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=sha1
@@ -29,7 +28,7 @@ includes:: depend
 depend:: $(SRCS)
 
 t_shs: t_shs.o shs.o
-       $(CC) $(CFLAGS) $(LDFLAGS) -o t_shs t_shs.o shs.o
+       $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o t_shs t_shs.o shs.o
 
 $(OUTPRE)t_shs.exe: $(OUTPRE)t_shs.obj $(OUTPRE)shs.obj
        link -out:$@ $**

diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
index 57e6a0466b3f4161fd42ff47a868554ba79fdbc9..863a34d237d43f44a2d28096cabf7d2089be3d8a 100644 (file)
--- a/src/lib/des425/Makefile.in
+++ b/src/lib/des425/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=.
 myfulldir=lib/des425
 mydir=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../crypto/des -I$(srcdir)/../../include/kerberosIV
+LOCALINCLUDES = -I$(srcdir)/../crypto/des -I$(srcdir)/../../include/kerberosIV
 
 ##DOS##BUILDTOP = ..\..
 ##DOS##LIBNAME=$(OUTPRE)des425.lib

diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 811fb2c2d46538ebbe82ef71b32aae9568404a4d..5952a28b03d8ee9a44a002a7d9f2443eb0288bd9 100644 (file)
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./..
 myfulldir=lib/gssapi/generic
 mydir=generic
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir)
+LOCALINCLUDES = -I. -I$(srcdir)
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=generic

diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index 6eb2a17dc360bd88ca8aca06cceb5508b18f6500..a8f5f8ff7fc75262189565e4b288079cee505ad5 100644 (file)
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./..
 myfulldir=lib/gssapi/krb5
 mydir=krb5
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic
+LOCALINCLUDES = -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=krb5

diff --git a/src/lib/gssapi/mechglue/Makefile.in b/src/lib/gssapi/mechglue/Makefile.in
index 3b7c17d7729fffcfccdc3d46d82fdb2afd8271c8..0c4ddfee7d0fbc286f97d5dffc26168ed8984521 100644 (file)
--- a/src/lib/gssapi/mechglue/Makefile.in
+++ b/src/lib/gssapi/mechglue/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=.
 myfulldir=lib/gssapi/mechglue
 mydir=.
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir)
+LOCALINCLUDES = -I. -I$(srcdir)
 
 ##DOSBUILDTOP = ..\..\..
 ##DOSLIBNAME=..\$(OUTPRE)gssapi.$(LIBEXT)
@@ -85,8 +85,6 @@ OBJS  = $(OUTPRE)g_acquire_cred.$(OBJEXT) \
 EHDRDIR= $(BUILDTOP)$(S)include$(S)gssapi
 EXPORTED_HEADERS = mechglue.h
 
-.c.o:
-       $(CC) $(CFLAGS) -c $(srcdir)/$*.c
 @SHARED_RULE@
 
 all:: all-$(WHAT) 

diff --git a/src/lib/kadm5/Makefile.in b/src/lib/kadm5/Makefile.in
index f07583d1d8167145749c5ea482e6a3168b0f011b..6f5efaae3fa7ac8bb2623809525e8092d02a2e5d 100644 (file)
--- a/src/lib/kadm5/Makefile.in
+++ b/src/lib/kadm5/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=.
 myfulldir=lib/kadm5
 mydir=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS)
 LOCAL_SUBDIRS = clnt srv unit-test
 
 ##DOSBUILDTOP = ..\..

diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in
index 925c8b868d81e584d319c912d7c184ba2cf205fd..0fc00ffe83d83d8dfb1cc85374862630e1220042 100644 (file)
--- a/src/lib/kadm5/clnt/Makefile.in
+++ b/src/lib/kadm5/clnt/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./..
 myfulldir=lib/kadm5/clnt
 mydir=clnt
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) -I$(BUILDTOP)/include/kadm5
+LOCALINCLUDES = -I$(BUILDTOP)/include/kadm5
 
 LIB=kadm5clnt
 LIBMAJOR=3

diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in
index 82130c21905d7e682d165ccbc8cae3bfd63e5a50..ed9018f04abb765ac0cb126449df6ab1b7ddf954 100644 (file)
--- a/src/lib/kadm5/srv/Makefile.in
+++ b/src/lib/kadm5/srv/Makefile.in
@@ -2,7 +2,8 @@ thisconfigdir=./..
 myfulldir=lib/kadm5/srv
 mydir=srv
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) -I$(BUILDTOP)/include/kadm5 @HESIOD_DEFS@
+LOCALINCLUDES = -I$(BUILDTOP)/include/kadm5
+DEFINES = @HESIOD_DEFS@
 
 ##DOSBUILDTOP = ..\..\..
 ##DOSLIBNAME = libkadm5srv.lib

diff --git a/src/lib/kadm5/unit-test/Makefile.in b/src/lib/kadm5/unit-test/Makefile.in
index 048173d0223c1a348b102997813bc331afca5c57..d75ba8f980450b908ac9e108ed0a6de31abfdec1 100644 (file)
--- a/src/lib/kadm5/unit-test/Makefile.in
+++ b/src/lib/kadm5/unit-test/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./..
 myfulldir=lib/kadm5/unit-test
 mydir=unit-test
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS  =      $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -DUSE_KADM5_API_VERSION=1
+DEFINES = -DUSE_KADM5_API_VERSION=1
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -19,7 +19,7 @@ init-test: init-test.o client_init.o $(KADMCLNT_DEPLIBS) $(KRB5_BASE_DEPLIBS)
                $(KADMCLNT_LIBS) $(KRB5_BASE_LIBS)
 
 client_init.o: $(SRCTOP)/lib/kadm5/clnt/client_init.c
-       $(CC) $(CFLAGS) -UUSE_KADM5_API_VERSION -DUSE_KADM5_API_VERSION=2 -DINIT_TEST -c -I$(SRCTOP)/lib/kadm5 $(SRCTOP)/lib/kadm5/clnt/client_init.c
+       $(CC) $(ALL_CFLAGS) -UUSE_KADM5_API_VERSION -DUSE_KADM5_API_VERSION=2 -DINIT_TEST -c -I$(SRCTOP)/lib/kadm5 $(SRCTOP)/lib/kadm5/clnt/client_init.c
 
 destroy-test: destroy-test.o $(KADMCLNT_DEPLIBS) $(KRB5_BASE_DEPLIBS)
        $(CC_LINK) -o destroy-test destroy-test.o \
@@ -58,7 +58,7 @@ server-iter-test: iter-test.o $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS)
                $(KADMSRV_LIBS) $(KRB5_BASE_LIBS)
 
 setkey-test.o: $(SRCTOP)/lib/kadm5/unit-test/setkey-test.c
-       $(CC) $(CFLAGS) -UUSE_KADM5_API_VERSION -DUSE_KADM5_API_VERSION=2 -c $(SRCTOP)/lib/kadm5/unit-test/setkey-test.c
+       $(CC) $(ALL_CFLAGS) -UUSE_KADM5_API_VERSION -DUSE_KADM5_API_VERSION=2 -c $(SRCTOP)/lib/kadm5/unit-test/setkey-test.c
 
 server-setkey-test: setkey-test.o $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS)
        $(CC_LINK) -o server-setkey-test setkey-test.o \

diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in
index 76b4e2fb6adb81486cafe002b5fd3c1ba3885996..68c636152b0e12c2a60e45aad8faa0a8fe9a202c 100644 (file)
--- a/src/lib/kdb/Makefile.in
+++ b/src/lib/kdb/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=.
 myfulldir=lib/kdb
 mydir=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS)
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 KRB5_CONFIG_SETUP = KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf ; export KRB5_CONFIG ;
 PROG_LIBPATH=-L$(TOPLIBD)

diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in
index ca9fb8dc7c519ab8374362d1141c9885e427691e..67dfa6062245e347d6cce5ba5455eb27eaa57ace 100644 (file)
--- a/src/lib/krb4/Makefile.in
+++ b/src/lib/krb4/Makefile.in
@@ -2,8 +2,7 @@ thisconfigdir=.
 myfulldir=lib/krb4
 mydir=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) $(DEFINES)
-DEFINES=-I$(srcdir)/../../include/kerberosIV
+DEFINES = -I$(srcdir)/../../include/kerberosIV
 
 ##DOS##BUILDTOP = ..\..
 ##DOS##LIBNAME=$(OUTPRE)krb4.lib
@@ -209,7 +208,7 @@ clean-unix::
 #      $(INSTALL_DATA) krb_err.h $(DESTDIR)$(KRB5_INCDIR)/kerberosIV/krb_err.h
 
 
-DEFINES=$(FALLBACK) $(OLD_SRVTAB) $(OLD_KLOGIN) -I$(srcdir)/../../include/kerberosIV
+DEFINES = $(FALLBACK) $(OLD_SRVTAB) $(OLD_KLOGIN) -I$(srcdir)/../../include/kerberosIV
 
 clean:: 
        -$(RM) $(OBJS)

diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in
index 4cd003e2db76fb9b09afdcef9755cf78b4fb799c..6a42d634ea04e23529f38bc5514d977bcb59abbd 100644 (file)
--- a/src/lib/krb5/asn.1/Makefile.in
+++ b/src/lib/krb5/asn.1/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./..
 myfulldir=lib/krb5/asn.1
 mydir=asn.1
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS=$(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=asn.1

diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index a9d426595498b8038cb4472f7b2e8f50e6c564f3..37abee4053798038d003eccac2941a7079d048b6 100644 (file)
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -4,7 +4,7 @@ mydir=ccache
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
 LOCAL_SUBDIRS = stdio file memory
 
-CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)$(S)file -I$(srcdir)$(S)stdio \
+LOCALINCLUDES = -I$(srcdir)$(S)file -I$(srcdir)$(S)stdio \
                -I$(srcdir)$(S)ccapi $(WIN_INCLUDES)
 
 ##DOS##WIN_INCLUDES = -I$(SRCTOP)\windows\lib

diff --git a/src/lib/krb5/ccache/ccapi/Makefile.in b/src/lib/krb5/ccache/ccapi/Makefile.in
index 7229f798ee5d1d9861a7c5b04745f2368bb4bb7c..9f8d1c5f4902c9151965f61ee009619407880d76 100644 (file)
--- a/src/lib/krb5/ccache/ccapi/Makefile.in
+++ b/src/lib/krb5/ccache/ccapi/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./../..
 myfulldir=lib/krb5/ccache/ccapi
 mydir=ccache/ccapi
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) $(WIN_INCLUDES)
+LOCALINCLUDES = $(WIN_INCLUDES)
 
 ##DOS##WIN_INCLUDES = -I$(SRCTOP)\windows\lib
 

diff --git a/src/lib/krb5/ccache/file/Makefile.in b/src/lib/krb5/ccache/file/Makefile.in
index 77cf38eed33a856e260e84ea483c4e9605e7a527..c1a2ace4de32587c763e9c2cab534d98dbdb4d94 100644 (file)
--- a/src/lib/krb5/ccache/file/Makefile.in
+++ b/src/lib/krb5/ccache/file/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./../..
 myfulldir=lib/krb5/ccache/file
 mydir=ccache/file
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..\..
 ##DOS##PREFIXDIR = ccache\file

diff --git a/src/lib/krb5/ccache/memory/Makefile.in b/src/lib/krb5/ccache/memory/Makefile.in
index 121ec9dc0cce3992fff8c5a18881b62f44f88405..fbe248fb808abe0b6df7d2d6ac392d8dfe4a3271 100644 (file)
--- a/src/lib/krb5/ccache/memory/Makefile.in
+++ b/src/lib/krb5/ccache/memory/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./../..
 myfulldir=lib/krb5/ccache/memory
 mydir=ccache/memory
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..\..
 ##DOS##PREFIXDIR = ccache\memory

diff --git a/src/lib/krb5/ccache/stdio/Makefile.in b/src/lib/krb5/ccache/stdio/Makefile.in
index 210ae8c6637fd3c77e36e335df6b51df02a8b949..3b06bc678218cf85d5da3d58e4c9cc07b2efb36a 100644 (file)
--- a/src/lib/krb5/ccache/stdio/Makefile.in
+++ b/src/lib/krb5/ccache/stdio/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./../..
 myfulldir=lib/krb5/ccache/stdio
 mydir=ccache/stdio
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS)
 
 STLIBOBJS = \
        scc_close.o scc_destry.o scc_eseq.o \

diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in
index a827fa235109718f90d54dfd62f32c771b5ff500..d2a52ebe52fc05b6fc093bc29167bce3cd1ee806 100644 (file)
--- a/src/lib/krb5/error_tables/Makefile.in
+++ b/src/lib/krb5/error_tables/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./..
 myfulldir=lib/krb5/error_tables
 mydir=error_tables
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=error_tables

diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in
index cdbe0b2e4d4087be1feb9f76446a2313ffbd4734..66677a159102b1f21cd7fb13333b876678c026ef 100644 (file)
--- a/src/lib/krb5/keytab/Makefile.in
+++ b/src/lib/krb5/keytab/Makefile.in
@@ -4,8 +4,6 @@ mydir=keytab
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
 LOCAL_SUBDIRS = file srvtab
 
-CFLAGS = $(CCOPTS) $(DEFS)
-
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=keytab
 ##DOS##OBJFILE=..\$(OUTPRE)$(PREFIXDIR).lst

diff --git a/src/lib/krb5/keytab/db/Makefile.in b/src/lib/krb5/keytab/db/Makefile.in
index 678bf2f881d755dc5c78f1268b8717e3ec52dbcf..9d31de16f67165f93fd5a163d3ad0ec71158394c 100644 (file)
--- a/src/lib/krb5/keytab/db/Makefile.in
+++ b/src/lib/krb5/keytab/db/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./../..
 myfulldir=lib/krb5/keytab/db
 mydir=keytab/db
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..\..\..
 ##DOSLIBNAME=..\..\krb5.lib

diff --git a/src/lib/krb5/keytab/file/Makefile.in b/src/lib/krb5/keytab/file/Makefile.in
index 1c0fa64dd5e144f4460443a5d53be850e9b8fa5e..d0706621a5e13f1385407aea4864b5cc5be6eb8c 100644 (file)
--- a/src/lib/krb5/keytab/file/Makefile.in
+++ b/src/lib/krb5/keytab/file/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./../..
 myfulldir=lib/krb5/keytab/file
 mydir=keytab/file
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..\..
 ##DOS##PREFIXDIR=keytab\file

diff --git a/src/lib/krb5/keytab/srvtab/Makefile.in b/src/lib/krb5/keytab/srvtab/Makefile.in
index 001050cd1ff996affd19dce6b79e3e7eb3100f7d..cffe1c632397b15c09799f267f70d3d54232cff2 100644 (file)
--- a/src/lib/krb5/keytab/srvtab/Makefile.in
+++ b/src/lib/krb5/keytab/srvtab/Makefile.in
@@ -3,8 +3,6 @@ myfulldir=lib/krb5/keytab/srvtab
 mydir=keytab/srvtab
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)$(S)$(U)
 
-CFLAGS = $(CCOPTS) $(DEFS)
-
 ##DOS##BUILDTOP = ..\..\..\..
 ##DOS##PREFIXDIR=keytab\srvtab
 ##DOS##OBJFILE=$(OUTPRE)srvtab.lst

diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index 4c68514906a93300027edd38aad131d2d2b58322..2ed30e897af9add196569a9a160eb15d3a25ec49 100644 (file)
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./..
 myfulldir=lib/krb5/krb
 mydir=krb
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS)
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)

diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in
index 21758dc280c647b86213776c849d86d79cbd5b7e..09df5a13d0b7f1c7f14ed837b6efccb75904fdda 100644 (file)
--- a/src/lib/krb5/os/Makefile.in
+++ b/src/lib/krb5/os/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./..
 myfulldir=lib/krb5/os
 mydir=os
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS)
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)

diff --git a/src/lib/krb5/posix/Makefile.in b/src/lib/krb5/posix/Makefile.in
index e608d3bd8d77d344247b3cf40c10541856995805..8f33a92137e4989acc775a2a212291329e802a03 100644 (file)
--- a/src/lib/krb5/posix/Makefile.in
+++ b/src/lib/krb5/posix/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./..
 myfulldir=lib/krb5/posix
 mydir=posix
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=posix

diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in
index 248d7760b0d8ca893071be24863700a73adfa10a..9bb3d0f615a1fa3dcba77972c44ba0249d6b7871 100644 (file)
--- a/src/lib/krb5/rcache/Makefile.in
+++ b/src/lib/krb5/rcache/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./..
 myfulldir=lib/krb5/rcache
 mydir=rcache
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=rcache

diff --git a/src/lib/krb5util/Makefile.in b/src/lib/krb5util/Makefile.in
index a254b42b7c45b69e03ff8366d33994d7ea8a7415..9e541a517823bd1e0d56e053d89ecf108a991f24 100644 (file)
--- a/src/lib/krb5util/Makefile.in
+++ b/src/lib/krb5util/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=.
 myfulldir=lib/krb5util
 mydir=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) 
 
 ##DOSBUILDTOP = ..\..
 ##DOSLIBNAME=krb5util.lib

diff --git a/src/lib/rpc/Makefile.in b/src/lib/rpc/Makefile.in
index de2ab2c26c769c11f4276816c6b45331b18d087a..487a1e4fdbb6b20972360263e1facdf5b240aaef 100644 (file)
--- a/src/lib/rpc/Makefile.in
+++ b/src/lib/rpc/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=.
 myfulldir=lib/rpc
 mydir=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) -DGSSAPI_KRB5 -DDEBUG_GSSAPI=0
+DEFINES = -DGSSAPI_KRB5 -DDEBUG_GSSAPI=0
 
 ##DOSBUILDTOP = ..\..
 ##DOSLIBNAME=libgssrpc.lib

diff --git a/src/lib/rpc/unit-test/Makefile.in b/src/lib/rpc/unit-test/Makefile.in
index 611b098a12876fadeb7327fe8bfa822679c66d16..7e2651cf575200b94988ba447c7b897b4907e3af 100644 (file)
--- a/src/lib/rpc/unit-test/Makefile.in
+++ b/src/lib/rpc/unit-test/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=.
 myfulldir=lib/rpc/unit-test
 mydir=.
 BUILDTOP=$(REL)$(U)$(S)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -I.
+LOCALINCLUDES = -I.
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 

diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in
index 927fb1e913458675f95365c6de269a6b4aa9ad9c..3caec4a48ead5d5c86d6f58af3568b73c7e88347 100644 (file)
--- a/src/slave/Makefile.in
+++ b/src/slave/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=.
 myfulldir=slave
 mydir=.
 BUILDTOP=$(REL)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 

diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index 02c94d240df5493dbc5704979bf09ca47ee035fd..4c7eed06a7faeec69ecc5243a7e6187a9d24253b 100644 (file)
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=.
 BUILDTOP=$(REL)$(U)
 LOCAL_SUBDIRS = resolve asn.1 create hammer verify gssapi dejagnu
 
-CFLAGS = $(CCOPTS)
 RUN_SETUP = @KRB5_RUN_ENV@ KRB5_KDC_PROFILE=kdc.conf KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf
 KRB5_RUN_ENV= @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)

diff --git a/src/tests/asn.1/Makefile.in b/src/tests/asn.1/Makefile.in
index 54ee75e2adae624d262f500448aed1398f5192cb..19b774963cd8844baff80ae950776469fdfc933e 100644 (file)
--- a/src/tests/asn.1/Makefile.in
+++ b/src/tests/asn.1/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./..
 myfulldir=tests/asn.1
 mydir=asn.1
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDES)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -27,7 +26,7 @@ krb5_decode_test: $(DECOBJS) $(KRB5_BASE_DEPLIBS)
        $(CC_LINK) -o krb5_decode_test $(DECOBJS) $(KRB5_BASE_LIBS)
 
 trval: $(srcdir)/trval.c
-       $(CC) -o trval $(CFLAGS) -DSTANDALONE $(srcdir)/trval.c
+       $(CC) -o trval $(ALL_CFLAGS) -DSTANDALONE $(srcdir)/trval.c
 
 check:: krb5_decode_test krb5_encode_test
        KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf ; \

diff --git a/src/tests/create/Makefile.in b/src/tests/create/Makefile.in
index 6ba741b21ca595739127c2fc3ef5c6ad3e3a9e66..15ebb9a18ea11eaa798a6004789623fc9cba6929 100644 (file)
--- a/src/tests/create/Makefile.in
+++ b/src/tests/create/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./..
 myfulldir=tests/create
 mydir=create
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 SRCS=$(srcdir)/kdb5_mkdums.c

diff --git a/src/tests/dejagnu/Makefile.in b/src/tests/dejagnu/Makefile.in
index 60de335bec6247f92ae12eca617838769179cdf3..a93bae008f9a86fecb413a53da129879ff4965ae 100644 (file)
--- a/src/tests/dejagnu/Makefile.in
+++ b/src/tests/dejagnu/Makefile.in
@@ -23,8 +23,6 @@ check-::
 check-runtest:: t_inetd site.exp
        $(HAVE_RUNTEST) --tool krb --srcdir $(srcdir) $(RUNTESTFLAGS)
 
-CFLAGS = $(CCOPTS) $(DEFS)
-
 t_inetd:: t_inetd.o $(KRB5_BASE_DEPLIBS)
        $(CC_LINK) -o t_inetd t_inetd.o $(KRB5_BASE_LIBS)
 

diff --git a/src/tests/gssapi/Makefile.in b/src/tests/gssapi/Makefile.in
index 4854683f58636c9dacc262459709e3f4af0c72ec..df8db19d517d62d0b22021bc96021e155e1da078 100644 (file)
--- a/src/tests/gssapi/Makefile.in
+++ b/src/tests/gssapi/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=./..
 myfulldir=tests/gssapi
 mydir=gssapi
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -DUSE_AUTOCONF_H
+DEFINES = -DUSE_AUTOCONF_H
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 

diff --git a/src/tests/hammer/Makefile.in b/src/tests/hammer/Makefile.in
index e4d14aa2377d7c130d8374c990edf2eb2a02709a..367ba8890acdf6fa6cf4706e24490d214b2adcf4 100644 (file)
--- a/src/tests/hammer/Makefile.in
+++ b/src/tests/hammer/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./..
 myfulldir=tests/hammer
 mydir=hammer
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 

diff --git a/src/tests/resolve/Makefile.in b/src/tests/resolve/Makefile.in
index 5e14eb028f9e32cd560f9beed19eb3a69363177e..f528d48897ea8e85d1ce3dc4616b3c9c27a4a7fb 100644 (file)
--- a/src/tests/resolve/Makefile.in
+++ b/src/tests/resolve/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./..
 myfulldir=tests/resolve
 mydir=resolve
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDES)
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)

diff --git a/src/tests/verify/Makefile.in b/src/tests/verify/Makefile.in
index 137ef379c2b21bd422f1121146cce601dfbc466d..cb4d4bdbb155da0c5e8756bdaf236f91e95b41e5 100644 (file)
--- a/src/tests/verify/Makefile.in
+++ b/src/tests/verify/Makefile.in
@@ -2,7 +2,6 @@ thisconfigdir=./..
 myfulldir=tests/verify
 mydir=verify
 BUILDTOP=$(REL)$(U)$(S)$(U)
-CFLAGS = $(CCOPTS) $(DEFS) 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index b374d7cd493fc1033afdc88b1fb07d97acfa646e..3b4fd5d9bfc7494c03e5130f92db8c50a28940b1 100644 (file)
--- 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 b81a78efbf3069264bd4a2d305f66a5de67b0b65..6c6f840f70e70c79b284c2e174f4c538ed7e822a 100644 (file)
--- 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 00315e3719376a3e90e6598eef6d7cc0d86aeebb..1215998cbf4e21fe2470a4d4dd554ec816831c2c 100644 (file)
--- 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 7385943dfbd7a311d107c3910402b9e833aefcc1..aa512ea1ec9ccdadedef46cfe6b2dccc9bcb6b5c 100644 (file)
--- 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 526684ccce61b02cb7746f1b956d3c20654d55fa..3955ca8cfaf4218a5fcccc1846070435a359e03f 100644 (file)
--- 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 8f573d84e1f04c588e845c50451eea89c5f7a2d1..83d61dc63a82f79b5ff740255d92be37fc374390 100644 (file)
--- 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 bafa04504558ba2ec43578ff4c067b54084cbfee..4168db767f3c5df6be63f245ffa3d9cd917c6bed 100644 (file)
--- 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 87f7e8e5b24774bf21f836f02b7f284b24982e7c..ce16e48d43d303e055385b516b7dd1c62447c29b 100644 (file)
--- 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
 #