summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog5
-rw-r--r--src/Makefile.in2
-rw-r--r--src/aclocal.m42
-rw-r--r--src/admin/Makefile.in4
-rw-r--r--src/admin/aname/Makefile.in2
-rw-r--r--src/admin/convert/Makefile.in2
-rw-r--r--src/admin/create/Makefile.in2
-rw-r--r--src/admin/destroy/Makefile.in2
-rw-r--r--src/admin/edit/Makefile.in2
-rw-r--r--src/admin/stash/Makefile.in2
-rw-r--r--src/appl/Makefile.in2
-rw-r--r--src/appl/sample/Makefile.in2
-rw-r--r--src/appl/sample/sclient/Makefile.in2
-rw-r--r--src/appl/sample/sserver/Makefile.in2
-rw-r--r--src/appl/simple/Makefile.in2
-rw-r--r--src/appl/simple/client/Makefile.in2
-rw-r--r--src/appl/simple/server/Makefile.in2
-rw-r--r--src/appl/telnet/libtelnet/Makefile.in2
-rw-r--r--src/appl/user_user/Makefile.in2
-rw-r--r--src/clients/Makefile.in2
-rw-r--r--src/clients/kdestroy/Makefile.in2
-rw-r--r--src/clients/kinit/Makefile.in2
-rw-r--r--src/clients/klist/Makefile.in2
-rw-r--r--src/isode/compat/Makefile.in2
-rw-r--r--src/isode/h/Makefile.in2
-rw-r--r--src/isode/pepsy/Makefile.in2
-rw-r--r--src/isode/psap/Makefile.in2
-rw-r--r--src/isode/support/Makefile.in2
-rw-r--r--src/kadmin/Makefile.in2
-rw-r--r--src/kadmin/client/Makefile.in2
-rw-r--r--src/kadmin/kpasswd/Makefile.in2
-rw-r--r--src/kdc/Makefile.in2
-rw-r--r--src/lib/Makefile.in2
-rw-r--r--src/lib/crypto/Makefile.in2
-rw-r--r--src/lib/crypto/crc32/Makefile.in2
-rw-r--r--src/lib/crypto/des/Makefile.in2
-rw-r--r--src/lib/crypto/md4/Makefile.in2
-rw-r--r--src/lib/crypto/md5/Makefile.in2
-rw-r--r--src/lib/crypto/os/Makefile.in2
-rw-r--r--src/lib/des425/Makefile.in2
-rw-r--r--src/lib/gssapi/generic/Makefile.in2
-rw-r--r--src/lib/gssapi/krb5/Makefile.in2
-rw-r--r--src/lib/kdb/Makefile.in2
-rw-r--r--src/lib/krb425/Makefile.in2
-rw-r--r--src/lib/krb5/asn.1/Makefile.in2
-rw-r--r--src/lib/krb5/ccache/Makefile.in2
-rw-r--r--src/lib/krb5/ccache/file/Makefile.in2
-rw-r--r--src/lib/krb5/ccache/stdio/Makefile.in2
-rw-r--r--src/lib/krb5/error_tables/Makefile.in2
-rw-r--r--src/lib/krb5/free/Makefile.in2
-rw-r--r--src/lib/krb5/keytab/Makefile.in2
-rw-r--r--src/lib/krb5/keytab/file/Makefile.in2
-rw-r--r--src/lib/krb5/krb/Makefile.in2
-rw-r--r--src/lib/krb5/os/Makefile.in2
-rw-r--r--src/lib/krb5/posix/Makefile.in2
-rw-r--r--src/lib/krb5/rcache/Makefile.in2
-rw-r--r--src/slave/Makefile.in2
-rw-r--r--src/util/Makefile.in2
-rw-r--r--src/util/et/Makefile.in2
-rw-r--r--src/util/ss/Makefile.in2
-rw-r--r--src/util/unifdef/Makefile.in2
61 files changed, 66 insertions, 61 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
new file mode 100644
index 000000000..836882a01
--- /dev/null
+++ b/src/ChangeLog
@@ -0,0 +1,5 @@
+Fri Jun 17 19:54:00 1994 Mark Eichin (eichin at cygnus.com)
+
+ * aclocal.m4 (MAKE_SUBDIRS): pass CCOPTS, CC in every make
+ * Makefile.in: change CFLAGS = -g ... to CFALGS = $(CCOPTS) ...
+ in all Makefile.in's throughout the tree.
diff --git a/src/Makefile.in b/src/Makefile.in
index 9cecae8ff..ece2de71b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g
+CFLAGS = $(CCOPTS)
LDFLAGS = -g
prefix = /usr/local
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index fb202c105..42bd2ba1d 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -133,7 +133,7 @@ $2::<<<
for i in $(SUBDIRS) ;\
do \
(cd $$i ; echo>>> $1 <<<"in $(CURRENT_DIR)$$i..."; \
- $(MAKE) $(MFLAGS) \
+ $(MAKE) $(MFLAGS) CCOPTS="$(CCOPTS)" CC="$(CC)" \
CURRENT_DIR=$(CURRENT_DIR)$$i/ >>>$2<<<); \
done>>>
divert(0)dnl
diff --git a/src/admin/Makefile.in b/src/admin/Makefile.in
index 500b5a2a8..246cb6b57 100644
--- a/src/admin/Makefile.in
+++ b/src/admin/Makefile.in
@@ -5,8 +5,8 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g
-LDFLAGS = -g
+CFLAGS = $(CCOPTS) $(DEFS)
+LDFLAGS = $(CCOPTS)
SUBDIRS = @SUBDIRS@
diff --git a/src/admin/aname/Makefile.in b/src/admin/aname/Makefile.in
index c63c7ab1d..8a163fdab 100644
--- a/src/admin/aname/Makefile.in
+++ b/src/admin/aname/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
SRCTOP = $(srcdir)/$(BUILDTOP)
diff --git a/src/admin/convert/Makefile.in b/src/admin/convert/Makefile.in
index e6bb32b7f..14b2b46c3 100644
--- a/src/admin/convert/Makefile.in
+++ b/src/admin/convert/Makefile.in
@@ -6,7 +6,7 @@ DEFS = @DEFS@
LIBS = @LIBS@
KRB4 = @KRB4@
-CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
SRCTOP = $(srcdir)/$(BUILDTOP)
diff --git a/src/admin/create/Makefile.in b/src/admin/create/Makefile.in
index 53bd1db61..516472846 100644
--- a/src/admin/create/Makefile.in
+++ b/src/admin/create/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
SRCTOP = $(srcdir)/$(BUILDTOP)
diff --git a/src/admin/destroy/Makefile.in b/src/admin/destroy/Makefile.in
index 0cd4fc4d1..aed648e4d 100644
--- a/src/admin/destroy/Makefile.in
+++ b/src/admin/destroy/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
SRCTOP = $(srcdir)/$(BUILDTOP)
diff --git a/src/admin/edit/Makefile.in b/src/admin/edit/Makefile.in
index 01496e600..251a47cc5 100644
--- a/src/admin/edit/Makefile.in
+++ b/src/admin/edit/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
SRCTOP = $(srcdir)/$(BUILDTOP)
diff --git a/src/admin/stash/Makefile.in b/src/admin/stash/Makefile.in
index 391941104..75c3cc05b 100644
--- a/src/admin/stash/Makefile.in
+++ b/src/admin/stash/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
SRCTOP = $(srcdir)/$(BUILDTOP)
diff --git a/src/appl/Makefile.in b/src/appl/Makefile.in
index 6fd0859a1..7be88b435 100644
--- a/src/appl/Makefile.in
+++ b/src/appl/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g
+CFLAGS = $(CCOPTS)
LDFLAGS = -g
SUBDIRS = @SUBDIRS@
diff --git a/src/appl/sample/Makefile.in b/src/appl/sample/Makefile.in
index 6fd0859a1..7be88b435 100644
--- a/src/appl/sample/Makefile.in
+++ b/src/appl/sample/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g
+CFLAGS = $(CCOPTS)
LDFLAGS = -g
SUBDIRS = @SUBDIRS@
diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in
index d79c362b7..457ad807d 100644
--- a/src/appl/sample/sclient/Makefile.in
+++ b/src/appl/sample/sclient/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
SRCTOP = $(srcdir)/$(BUILDTOP)
diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in
index 12ab63547..928739774 100644
--- a/src/appl/sample/sserver/Makefile.in
+++ b/src/appl/sample/sserver/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
SRCTOP = $(srcdir)/$(BUILDTOP)
diff --git a/src/appl/simple/Makefile.in b/src/appl/simple/Makefile.in
index 6fd0859a1..7be88b435 100644
--- a/src/appl/simple/Makefile.in
+++ b/src/appl/simple/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g
+CFLAGS = $(CCOPTS)
LDFLAGS = -g
SUBDIRS = @SUBDIRS@
diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in
index 58a64b04c..25e6a1fcc 100644
--- a/src/appl/simple/client/Makefile.in
+++ b/src/appl/simple/client/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
SRCTOP = $(srcdir)/$(BUILDTOP)
diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in
index 6d852c882..5993ee7cb 100644
--- a/src/appl/simple/server/Makefile.in
+++ b/src/appl/simple/server/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
SRCTOP = $(srcdir)/$(BUILDTOP)
diff --git a/src/appl/telnet/libtelnet/Makefile.in b/src/appl/telnet/libtelnet/Makefile.in
index 1f1129b69..1e2315476 100644
--- a/src/appl/telnet/libtelnet/Makefile.in
+++ b/src/appl/telnet/libtelnet/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
SRCTOP = $(srcdir)/$(BUILDTOP)
diff --git a/src/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in
index 6cf5ce263..e05042b9b 100644
--- a/src/appl/user_user/Makefile.in
+++ b/src/appl/user_user/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS) -DDEBUG
+CFLAGS = $(CCOPTS) $(DEFS) -DDEBUG
LDFLAGS = -g
SRCTOP = $(srcdir)/$(BUILDTOP)
diff --git a/src/clients/Makefile.in b/src/clients/Makefile.in
index 6fd0859a1..7be88b435 100644
--- a/src/clients/Makefile.in
+++ b/src/clients/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g
+CFLAGS = $(CCOPTS)
LDFLAGS = -g
SUBDIRS = @SUBDIRS@
diff --git a/src/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in
index 9f6eb194c..eacc6dd23 100644
--- a/src/clients/kdestroy/Makefile.in
+++ b/src/clients/kdestroy/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
SRCTOP = $(srcdir)/$(BUILDTOP)
diff --git a/src/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in
index b583384ff..ad1976f2e 100644
--- a/src/clients/kinit/Makefile.in
+++ b/src/clients/kinit/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
SRCTOP = $(srcdir)/$(BUILDTOP)
diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in
index dd002985a..2eec62f86 100644
--- a/src/clients/klist/Makefile.in
+++ b/src/clients/klist/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
SRCTOP = $(srcdir)/$(BUILDTOP)
diff --git a/src/isode/compat/Makefile.in b/src/isode/compat/Makefile.in
index a76fd57e9..5ad67dfd1 100644
--- a/src/isode/compat/Makefile.in
+++ b/src/isode/compat/Makefile.in
@@ -9,7 +9,7 @@ VPATH = @srcdir@
TOPDIR = $(BUILDTOP)/
OPTIONS = -I. -I$(HDIR) -I$(ISODEINC) $(PEPYPATH) $(KRBOPT)
-CFLAGS = $(OPTIONS) $(LOPTIONS)
+CFLAGS = $(CCOPTS) $(OPTIONS) $(LOPTIONS)
KRBINC = $(TOPDIR)include/
ISODEINCM= $(KRBINC)isode
diff --git a/src/isode/h/Makefile.in b/src/isode/h/Makefile.in
index 2390c5e8f..18eb0f975 100644
--- a/src/isode/h/Makefile.in
+++ b/src/isode/h/Makefile.in
@@ -8,7 +8,7 @@ VPATH = @srcdir@
TOPDIR = $(BUILDTOP)/
OPTIONS = -I. -I$(HDIR) $(PEPYPATH) $(KRBOPT)
-CFLAGS = $(OPTIONS) $(LOPTIONS)
+CFLAGS = $(CCOPTS) $(OPTIONS) $(LOPTIONS)
HDIR = $(TOPDIR)isode/h/
UTILDIR = $(TOPDIR)isode/util/
diff --git a/src/isode/pepsy/Makefile.in b/src/isode/pepsy/Makefile.in
index 0b7db0f2a..a3ee9e35b 100644
--- a/src/isode/pepsy/Makefile.in
+++ b/src/isode/pepsy/Makefile.in
@@ -10,7 +10,7 @@ DEFS = @DEFS@
TOPDIR = $(BUILDTOP)/
OPTIONS = -I. -I$(HDIR) -I$(TOPDIR)include $(PEPYPATH) $(KRBOPT)
-CFLAGS = $(OPTIONS) $(LOPTIONS) $(DEFS)
+CFLAGS = $(CCOPTS) $(OPTIONS) $(LOPTIONS) $(DEFS)
HDIR = $(srcdir)/$(TOPDIR)isode/h/
UTILDIR = $(srcdir)/$(TOPDIR)isode/util/
diff --git a/src/isode/psap/Makefile.in b/src/isode/psap/Makefile.in
index c13f7564b..75b609669 100644
--- a/src/isode/psap/Makefile.in
+++ b/src/isode/psap/Makefile.in
@@ -10,7 +10,7 @@ TOPDIR = $(BUILDTOP)/
LIBDIR = $(TOPDIR)lib/
OPTIONS = -I. -I$(HDIR) -I$(ISODEINC) $(PEPYPATH) $(KRBOPT)
-CFLAGS = $(OPTIONS) $(LOPTIONS)
+CFLAGS = $(CCOPTS) $(OPTIONS) $(LOPTIONS)
KRBINC = $(TOPDIR)include/
ISODEINCM= $(KRBINC)isode
diff --git a/src/isode/support/Makefile.in b/src/isode/support/Makefile.in
index 6d6df306e..a5c7624f7 100644
--- a/src/isode/support/Makefile.in
+++ b/src/isode/support/Makefile.in
@@ -9,7 +9,7 @@ VPATH = @srcdir@
TOPDIR = $(BUILDTOP)/
OPTIONS = -I. -I$(HDIR) $(PEPYPATH) $(KRBOPT)
-CFLAGS = $(OPTIONS) $(LOPTIONS)
+CFLAGS = $(CCOPTS) $(OPTIONS) $(LOPTIONS)
HDIR = $(srcdir)/$(TOPDIR)isode/h/
UTILDIR = $(srcdir)/$(TOPDIR)isode/util/
diff --git a/src/kadmin/Makefile.in b/src/kadmin/Makefile.in
index 2f8305498..fa3f7d8c5 100644
--- a/src/kadmin/Makefile.in
+++ b/src/kadmin/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g
+CFLAGS = $(CCOPTS)
LDFLAGS = -g
SUBDIRS = @SUBDIRS@
diff --git a/src/kadmin/client/Makefile.in b/src/kadmin/client/Makefile.in
index ea4314579..36dbf8a6e 100644
--- a/src/kadmin/client/Makefile.in
+++ b/src/kadmin/client/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
SRCTOP = $(srcdir)/$(BUILDTOP)
diff --git a/src/kadmin/kpasswd/Makefile.in b/src/kadmin/kpasswd/Makefile.in
index 750729a50..6078802b3 100644
--- a/src/kadmin/kpasswd/Makefile.in
+++ b/src/kadmin/kpasswd/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
SRCTOP = $(srcdir)/$(BUILDTOP)
diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
index b42646763..1d0a5c8a3 100644
--- a/src/kdc/Makefile.in
+++ b/src/kdc/Makefile.in
@@ -7,7 +7,7 @@ LIBS = @LIBS@
KRB4 = @KRB4@
K4LIB = @K4LIB@
-CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
SRCTOP = $(srcdir)/$(BUILDTOP)
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index d2fbf83ab..9c59f7949 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g
+CFLAGS = $(CCOPTS) $(DEFS)
LDFLAGS = -g
SUBDIRS = @SUBDIRS@
diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index fe1946e95..e53a01cb8 100644
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -10,7 +10,7 @@ SUBDIRS = @SUBDIRS@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS)
+CFLAGS = $(CCOPTS) $(DEFS)
LDFLAGS = -g
RM = rm -f
diff --git a/src/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in
index 7f9cf8f88..c7fcf0c2f 100644
--- a/src/lib/crypto/crc32/Makefile.in
+++ b/src/lib/crypto/crc32/Makefile.in
@@ -7,7 +7,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS)
+CFLAGS = $(CCOPTS) $(DEFS)
LDFLAGS = -g
RM = rm -f
diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in
index 5ee98d937..e5cecd046 100644
--- a/src/lib/crypto/des/Makefile.in
+++ b/src/lib/crypto/des/Makefile.in
@@ -7,7 +7,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS)
+CFLAGS = $(CCOPTS) $(DEFS)
LDFLAGS = -g
RM = rm -f
diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in
index 0e758dd51..10e676172 100644
--- a/src/lib/crypto/md4/Makefile.in
+++ b/src/lib/crypto/md4/Makefile.in
@@ -7,7 +7,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS)
+CFLAGS = $(CCOPTS) $(DEFS)
LDFLAGS = -g
RM = rm -f
diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in
index a8c5a1c3c..efbbe19ee 100644
--- a/src/lib/crypto/md5/Makefile.in
+++ b/src/lib/crypto/md5/Makefile.in
@@ -7,7 +7,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS)
+CFLAGS = $(CCOPTS) $(DEFS)
LDFLAGS = -g
RM = rm -f
diff --git a/src/lib/crypto/os/Makefile.in b/src/lib/crypto/os/Makefile.in
index 646883479..6308ae39c 100644
--- a/src/lib/crypto/os/Makefile.in
+++ b/src/lib/crypto/os/Makefile.in
@@ -7,7 +7,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS)
+CFLAGS = $(CCOPTS) $(DEFS)
LDFLAGS = -g
RM = rm -f
diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
index f9ee53cfb..4b56b1e7c 100644
--- a/src/lib/des425/Makefile.in
+++ b/src/lib/des425/Makefile.in
@@ -11,7 +11,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS)
+CFLAGS = $(CCOPTS) $(DEFS)
LDFLAGS = -g
RM = rm -f
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index bc2359ecb..7661a52d2 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -7,7 +7,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS) -I. -I$(srcdir)
+CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir)
LDFLAGS = -g
RM = rm -f
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index 7a6e82a3d..ce164a49c 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -7,7 +7,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS) -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic
+CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic
LDFLAGS = -g
RM = rm -f
diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in
index 369a8c71c..83eb111fb 100644
--- a/src/lib/kdb/Makefile.in
+++ b/src/lib/kdb/Makefile.in
@@ -9,7 +9,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS)
+CFLAGS = $(CCOPTS) $(DEFS)
LDFLAGS = -g
RM = rm -f
diff --git a/src/lib/krb425/Makefile.in b/src/lib/krb425/Makefile.in
index c5b3ac250..887e39503 100644
--- a/src/lib/krb425/Makefile.in
+++ b/src/lib/krb425/Makefile.in
@@ -9,7 +9,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS) -I$(SRCTOP)/include/kerberosIV
+CFLAGS = $(CCOPTS) $(DEFS) -I$(SRCTOP)/include/kerberosIV
LDFLAGS = -g
EHDRDIR = $(BUILDTOP)/include/kerberosIV
diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in
index c0a86e5a4..1cf55f100 100644
--- a/src/lib/krb5/asn.1/Makefile.in
+++ b/src/lib/krb5/asn.1/Makefile.in
@@ -6,7 +6,7 @@ DEFS = @DEFS@
LIBS = @LIBS@
# -I. for isode/
-CFLAGS = -g $(DEFS) -DPEPSY_LINKABLE_FUNCS -I.
+CFLAGS = $(CCOPTS) $(DEFS) -DPEPSY_LINKABLE_FUNCS -I.
LDFLAGS = -g
RM = rm -f
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index a2a1deb80..5e1984c12 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -7,7 +7,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS)
+CFLAGS = $(CCOPTS) $(DEFS)
LDFLAGS = -g
RM = rm -f
diff --git a/src/lib/krb5/ccache/file/Makefile.in b/src/lib/krb5/ccache/file/Makefile.in
index 4042d5c98..ce1fc102a 100644
--- a/src/lib/krb5/ccache/file/Makefile.in
+++ b/src/lib/krb5/ccache/file/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS)
+CFLAGS = $(CCOPTS) $(DEFS)
LDFLAGS = -g
RM = rm -f
diff --git a/src/lib/krb5/ccache/stdio/Makefile.in b/src/lib/krb5/ccache/stdio/Makefile.in
index 4d30ca41c..e1846fc12 100644
--- a/src/lib/krb5/ccache/stdio/Makefile.in
+++ b/src/lib/krb5/ccache/stdio/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS)
+CFLAGS = $(CCOPTS) $(DEFS)
LDFLAGS = -g
RM = rm -f
diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in
index 7be230d09..496df9dda 100644
--- a/src/lib/krb5/error_tables/Makefile.in
+++ b/src/lib/krb5/error_tables/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS)
+CFLAGS = $(CCOPTS) $(DEFS)
LDFLAGS = -g
RM = rm -f
diff --git a/src/lib/krb5/free/Makefile.in b/src/lib/krb5/free/Makefile.in
index fde268cbe..01195b055 100644
--- a/src/lib/krb5/free/Makefile.in
+++ b/src/lib/krb5/free/Makefile.in
@@ -7,7 +7,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS)
+CFLAGS = $(CCOPTS) $(DEFS)
LDFLAGS = -g
RM = rm -f
diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in
index 3c9fab608..4e74ab385 100644
--- a/src/lib/krb5/keytab/Makefile.in
+++ b/src/lib/krb5/keytab/Makefile.in
@@ -7,7 +7,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS)
+CFLAGS = $(CCOPTS) $(DEFS)
LDFLAGS = -g
RM = rm -f
diff --git a/src/lib/krb5/keytab/file/Makefile.in b/src/lib/krb5/keytab/file/Makefile.in
index 8f2cead56..e787e108c 100644
--- a/src/lib/krb5/keytab/file/Makefile.in
+++ b/src/lib/krb5/keytab/file/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS)
+CFLAGS = $(CCOPTS) $(DEFS)
LDFLAGS = -g
RM = rm -f
diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index 70ef54732..71a14747a 100644
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -7,7 +7,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS)
+CFLAGS = $(CCOPTS) $(DEFS)
LDFLAGS = -g
RM = rm -f
diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in
index 33d5ee341..44a315191 100644
--- a/src/lib/krb5/os/Makefile.in
+++ b/src/lib/krb5/os/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS)
+CFLAGS = $(CCOPTS) $(DEFS)
LDFLAGS = -g
RM = rm -f
diff --git a/src/lib/krb5/posix/Makefile.in b/src/lib/krb5/posix/Makefile.in
index fa76077e0..ad8760f8b 100644
--- a/src/lib/krb5/posix/Makefile.in
+++ b/src/lib/krb5/posix/Makefile.in
@@ -7,7 +7,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS)
+CFLAGS = $(CCOPTS) $(DEFS)
LDFLAGS = -g
RM = rm -f
diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in
index baa147f98..e91c2e6b9 100644
--- a/src/lib/krb5/rcache/Makefile.in
+++ b/src/lib/krb5/rcache/Makefile.in
@@ -7,7 +7,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS)
+CFLAGS = $(CCOPTS) $(DEFS)
LDFLAGS = -g
RM = rm -f
diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in
index 8a31cd165..e4f7cd1a0 100644
--- a/src/slave/Makefile.in
+++ b/src/slave/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
SRCTOP = $(srcdir)/$(BUILDTOP)
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 6fd0859a1..7be88b435 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g
+CFLAGS = $(CCOPTS)
LDFLAGS = -g
SUBDIRS = @SUBDIRS@
diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index ae022240c..9c2475ca3 100644
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
LEX = @LEX@
diff --git a/src/util/ss/Makefile.in b/src/util/ss/Makefile.in
index de6e49c37..612ab23af 100644
--- a/src/util/ss/Makefile.in
+++ b/src/util/ss/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
LEX = @LEX@
diff --git a/src/util/unifdef/Makefile.in b/src/util/unifdef/Makefile.in
index c8670fd43..d8eb2d230 100644
--- a/src/util/unifdef/Makefile.in
+++ b/src/util/unifdef/Makefile.in
@@ -5,7 +5,7 @@ VPATH = @srcdir@
DEFS = @DEFS@
LIBS = @LIBS@
-CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
all::