diff options
| author | Wilfredo Sanchez <tritan@mit.edu> | 1999-10-26 01:49:53 +0000 |
|---|---|---|
| committer | Wilfredo Sanchez <tritan@mit.edu> | 1999-10-26 01:49:53 +0000 |
| commit | 576f92854331c90f779e721443dcd375e6851670 (patch) | |
| tree | 7730482a06f359c2997068ac71a5358d397dc0f9 /src | |
| parent | 3edb32acbb73c8d52e66ab71b71c0b5896fe5400 (diff) | |
| download | krb5-576f92854331c90f779e721443dcd375e6851670.zip krb5-576f92854331c90f779e721443dcd375e6851670.tar.gz krb5-576f92854331c90f779e721443dcd375e6851670.tar.bz2 | |
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
Diffstat (limited to 'src')
97 files changed, 141 insertions, 197 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 7aeab20..8f8fc00 100644 --- 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 d29642a..217aee5 100644 --- 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 faeaff4..eee13ca 100644 --- 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 cb01396..d564f7e 100644 --- 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 e1f1ef9..b498b13 100644 --- 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 73f7b3b..d9d9818 100644 --- 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 98d11ec..eb66bbb 100644 --- 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 1678cad..e0c7ce5 100644 --- 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 744a404..cf286a4 100644 --- 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 5e0b93a..cf3a151 100644 --- 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 0e46bef..1331664 100644 --- 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 023180d..5ac73b9 100644 --- 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 f0fb9d6..ade8d58 100644 --- 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 31d98b3..48bbe53 100644 --- 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 3654e17..a1fd6f5 100644 --- 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 2fbec0e..01bd66a 100644 --- 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 7721c22..5185da5 100644 --- 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 c569e42..b09d3ff 100644 --- 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 cff0dc9..6206e09 100644 --- 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 5c5af91..680388e 100644 --- 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 dddc05b..4aae2e0 100644 --- 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 b31a3f6..8d25ee6 100644 --- 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 080e75a..fdd4716 100644 --- 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 e2cf595..f8af821 100644 --- 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 6a31828..79b734b 100644 --- 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 b8d565f..45fb6d9 100644 --- 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 23f81b7..749b6c1 100644 --- 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 3654c78..5d8bbc5 100644 --- 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 7567d76..8f6e20d 100644 --- 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 aeda38f..139d4d2 100644 --- 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 b043078..e043618 100644 --- 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 98cf83b..39d0830 100644 --- 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 73029d4..8728a1f 100644 --- 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 c189bf8..be5b5a8 100644 --- 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 43d9334..2372543 100644 --- 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 f7ff7af..43b19e1 100644 --- 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 9b189d4..8532370 100644 --- 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 b23d8ab..58b0e4f 100644 --- 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 190a1a6..d64c3eb 100644 --- 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 8f053e4..aee2bed 100644 --- 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 27956fe..d86325b 100644 --- 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 03dbc15..7136a38 100644 --- 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 3e25c47..2634584 100644 --- 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 88c3ad3..2b4b14a 100644 --- 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 f757bf6..e0672a2 100644 --- 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 1b2c988..e5ba5cc 100644 --- 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 a9317a9..50c9d35 100644 --- 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 ba212a7..f5c7d26 100644 --- 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 896de96..98d0b31 100644 --- 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 f808ed6..cab1b35 100644 --- 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 427bb6b..e3ca3c6 100644 --- 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 2f8cea1..5d1b69c 100644 --- 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 57e6a04..863a34d 100644 --- 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 811fb2c..5952a28 100644 --- 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 6eb2a17..a8f5f8f 100644 --- 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 3b7c17d..0c4ddfe 100644 --- 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 f07583d..6f5efaa 100644 --- 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 925c8b8..0fc00ff 100644 --- 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 82130c2..ed9018f 100644 --- 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 048173d..d75ba8f 100644 --- 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 76b4e2f..68c6361 100644 --- 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 ca9fb8d..67dfa60 100644 --- 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 4cd003e..6a42d63 100644 --- 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 a9d4265..37abee4 100644 --- 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 7229f79..9f8d1c5 100644 --- 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 77cf38e..c1a2ace 100644 --- 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 121ec9d..fbe248f 100644 --- 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 210ae8c..3b06bc6 100644 --- 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 a827fa2..d2a52eb 100644 --- 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 cdbe0b2..66677a1 100644 --- 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 678bf2f..9d31de1 100644 --- 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 1c0fa64..d070662 100644 --- 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 001050c..cffe1c6 100644 --- 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 4c68514..2ed30e8 100644 --- 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 21758dc..09df5a1 100644 --- 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 e608d3b..8f33a92 100644 --- 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 248d776..9bb3d0f 100644 --- 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 a254b42..9e541a5 100644 --- 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 de2ab2c..487a1e4 100644 --- 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 611b098..7e2651c 100644 --- 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 927fb1e..3caec4a 100644 --- 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 02c94d2..4c7eed0 100644 --- 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 54ee75e..19b7749 100644 --- 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 6ba741b..15ebb9a 100644 --- 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 60de335..a93bae0 100644 --- 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 4854683..df8db19 100644 --- 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 e4d14aa..367ba88 100644 --- 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 5e14eb0..f528d48 100644 --- 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 137ef37..cb4d4bd 100644 --- 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 b374d7c..3b4fd5d 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 b81a78e..6c6f840 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 00315e3..1215998 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 7385943..aa512ea 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 526684c..3955ca8 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 8f573d8..83d61dc 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 bafa045..4168db7 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 87f7e8e..ce16e48 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 # |