Do CFLAGS the gnu standard way. This means we compile with -g by default.

12 files changed, 73 insertions, 25 deletions

diff --git a/clients/syslogd/Makefile.in b/clients/syslogd/Makefile.in
index 8f1cea8..99bd771 100644
--- a/clients/syslogd/Makefile.in
+++ b/clients/syslogd/Makefile.in
@@ -19,8 +19,9 @@ VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
 
-DEBUG=-O
-CFLAGS=${DEBUG} -I${srcdir} -I${top_srcdir}/h -I${BUILDTOP}/h @CPPFLAGS@
+CPPFLAGS=@CPPFLAGS@
+CFLAGS=@CFLAGS@
+ALL_CFLAGS=${CFLAGS} -I${srcdir} -I${top_srcdir}/h -I${BUILDTOP}/h ${CPPFLAGS}
 LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@
 LIBS=-lzephyr @LIBS@ -lcom_err @SLIB@
 
@@ -31,6 +32,9 @@ all: syslogd
 syslogd: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
+.c.o:
+	${CC} -c ${ALL_CFLAGS} $<
+
 check:
 
 install: syslogd
diff --git a/clients/xzwrite/Makefile.in b/clients/xzwrite/Makefile.in
index 1013ab9..8867e93 100644
--- a/clients/xzwrite/Makefile.in
+++ b/clients/xzwrite/Makefile.in
@@ -20,9 +20,10 @@ CC=@CC@
 INSTALL=@INSTALL@
 at=@
 
-DEBUG=-O
-CFLAGS=${DEBUG} -DDATADIR=\"${datadir}\" -I${top_srcdir}/h \
-	-I${BUILDTOP}/h @X_CFLAGS@ @CPPFLAGS@
+CPPFLAGS=@CPPFLAGS@
+CFLAGS=@CFLAGS@
+ALL_CFLAGS=${CFLAGS} -DDATADIR=\"${datadir}\" -I${top_srcdir}/h \
+	-I${BUILDTOP}/h @X_CFLAGS@ ${CPPFLAGS}
 LDFLAGS=${DEBUG} -L${BUILDTOP}/lib -L${BUILDTOP}/libdyn @X_LIBS@ @LDFLAGS@
 LIBS=-lzephyr -ldyn -lXaw -lXmu -lXt @X_PRE_LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ \
      @LIBS@ -lcom_err
@@ -36,6 +37,9 @@ all: xzwrite XZwrite
 xzwrite: ${OBJS} ${BUILDTOP}/lib/libzephyr.a ${BUILDTOP}/libdyn/libdyn.a
 	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
+.c.o:
+	${CC} -c ${ALL_CFLAGS} $<
+
 XZwrite: XZwrite.in
 	rm -f XZwrite
 	sed -e 's,$(at)datadir$(at),$(datadir),' < XZwrite.in > XZwrite
diff --git a/clients/zaway/Makefile.in b/clients/zaway/Makefile.in
index 314d38d..86c42f4 100644
--- a/clients/zaway/Makefile.in
+++ b/clients/zaway/Makefile.in
@@ -19,8 +19,9 @@ VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
 
-DEBUG=-O
-CFLAGS=${DEBUG} -I${top_srcdir}/h -I${BUILDTOP}/h @CPPFLAGS@
+CPPFLAGS=@CPPFLAGS@
+CFLAGS=@CFLAGS@
+ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h ${CPPFLAGS}
 LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@
 LIBS=-lzephyr @LIBS@ -lcom_err
 
@@ -31,6 +32,9 @@ all: zaway
 zaway: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
+.c.o:
+	${CC} -c ${ALL_CFLAGS} $<
+
 check:
 
 install: zaway
diff --git a/clients/zctl/Makefile.in b/clients/zctl/Makefile.in
index 40ac4f4..04a06c3 100644
--- a/clients/zctl/Makefile.in
+++ b/clients/zctl/Makefile.in
@@ -19,8 +19,9 @@ VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
 
-DEBUG=-O
-CFLAGS=${DEBUG} -I${top_srcdir}/h -I${BUILDTOP}/h @X_CFLAGS@ @CPPFLAGS@
+CPPFLAGS=@CPPFLAGS@
+CFLAGS=@CFLAGS@
+ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h @X_CFLAGS@ ${CPPFLAGS}
 LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@
 LIBS=-lzephyr -lss @LIBS@ -lcom_err
 
@@ -34,6 +35,9 @@ zctl: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 zctl_cmds.c: zctl_cmds.ct
 	mk_cmds ${srcdir}/zctl_cmds.ct
 
+.c.o:
+	${CC} -c ${ALL_CFLAGS} $<
+
 check:
 
 install: zctl
diff --git a/clients/zleave/Makefile.in b/clients/zleave/Makefile.in
index e452681..8b3b104 100644
--- a/clients/zleave/Makefile.in
+++ b/clients/zleave/Makefile.in
@@ -19,8 +19,9 @@ VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
 
-DEBUG=-O
-CFLAGS=${DEBUG} -I${top_srcdir}/h -I${BUILDTOP}/h @CPPFLAGS@
+CPPFLAGS=@CPPFLAGS@
+CFLAGS=@CFLAGS@
+ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h ${CPPFLAGS}
 LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@
 LIBS=-lzephyr @LIBS@ -lcom_err
 
@@ -31,6 +32,9 @@ all: zleave
 zleave: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
+.c.o:
+	${CC} -c ${ALL_CFLAGS} $<
+
 check:
 
 install: zleave
diff --git a/clients/zlocate/Makefile.in b/clients/zlocate/Makefile.in
index 49c3414..dcfc31f 100644
--- a/clients/zlocate/Makefile.in
+++ b/clients/zlocate/Makefile.in
@@ -19,8 +19,9 @@ VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
 
-DEBUG=-g
-CFLAGS=${DEBUG} -I${top_srcdir}/h -I${BUILDTOP}/h @CPPFLAGS@
+CPPFLAGS=@CPPFLAGS@
+CFLAGS=@CFLAGS@
+ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h ${CPPFLAGS}
 LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@
 LIBS=-lzephyr @LIBS@ -lcom_err
 
@@ -31,6 +32,9 @@ all: zlocate
 zlocate: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
+.c.o:
+	${CC} -c ${ALL_CFLAGS} $<
+
 check:
 
 install: zlocate
diff --git a/clients/zmailnotify/Makefile.in b/clients/zmailnotify/Makefile.in
index 4c32b21..1270776 100644
--- a/clients/zmailnotify/Makefile.in
+++ b/clients/zmailnotify/Makefile.in
@@ -19,8 +19,9 @@ VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
 
-DEBUG=-O
-CFLAGS=${DEBUG} -I${top_srcdir}/h -I${BUILDTOP}/h -DKPOP @CPPFLAGS@
+CPPFLAGS=@CPPFLAGS@
+CFLAGS=@CFLAGS@
+ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h -DKPOP ${CPPFLAGS}
 LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@
 LIBS=-lzephyr @LIBS@ -lcom_err
 
@@ -31,6 +32,9 @@ all: zmailnotify
 zmailnotify: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
+.c.o:
+	${CC} -c ${ALL_CFLAGS} $<
+
 check:
 
 install: zmailnotify
diff --git a/clients/znol/Makefile.in b/clients/znol/Makefile.in
index f9bab22..a56f55f 100644
--- a/clients/znol/Makefile.in
+++ b/clients/znol/Makefile.in
@@ -19,8 +19,9 @@ VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
 
-DEBUG=-O
-CFLAGS=${DEBUG} -I${top_srcdir}/h -I${BUILDTOP}/h @CPPFLAGS@
+CPPFLAGS=@CPPFLAGS@
+CFLAGS=@CFLAGS@
+ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h ${CPPFLAGS}
 LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@
 LIBS=-lzephyr @LIBS@ -lcom_err
 
@@ -31,6 +32,9 @@ all: znol
 znol: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
+.c.o:
+	${CC} -c ${ALL_CFLAGS} $<
+
 check:
 
 install: znol
diff --git a/clients/zpopnotify/Makefile.in b/clients/zpopnotify/Makefile.in
index 0156c35..a4d6fe4 100644
--- a/clients/zpopnotify/Makefile.in
+++ b/clients/zpopnotify/Makefile.in
@@ -19,8 +19,9 @@ VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
 
-DEBUG=-O
-CFLAGS=${DEBUG} -I${top_srcdir}/h -I${BUILDTOP}/h @CPPFLAGS@
+CPPFLAGS=@CPPFLAGS@
+CFLAGS=@CFLAGS@
+ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h ${CPPFLAGS}
 LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@
 LIBS=-lzephyr @LIBS@ -lcom_err
 
@@ -31,6 +32,9 @@ all: zpopnotify
 zpopnotify: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
+.c.o:
+	${CC} -c ${ALL_CFLAGS} $<
+
 check:
 
 install: zpopnotify
diff --git a/clients/zshutdown_notify/Makefile.in b/clients/zshutdown_notify/Makefile.in
index 8935127..a6f37e1 100644
--- a/clients/zshutdown_notify/Makefile.in
+++ b/clients/zshutdown_notify/Makefile.in
@@ -19,8 +19,9 @@ VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
 
-DEBUG=-O
-CFLAGS=${DEBUG} -I${top_srcdir}/h -I${BUILDTOP}/h @CPPFLAGS@
+CPPFLAGS=@CPPFLAGS@
+CFLAGS=@CFLAGS@
+ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h ${CPPFLAGS}
 LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@
 LIBS=-lzephyr @LIBS@ -lcom_err
 
@@ -31,6 +32,9 @@ all: zshutdown_notify
 zshutdown_notify: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
+.c.o:
+	${CC} -c ${ALL_CFLAGS} $<
+
 check:
 
 install: zshutdown_notify
diff --git a/clients/zstat/Makefile.in b/clients/zstat/Makefile.in
index e11dfcb..fe44d62 100644
--- a/clients/zstat/Makefile.in
+++ b/clients/zstat/Makefile.in
@@ -19,8 +19,9 @@ VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
 
-DEBUG=-O
-CFLAGS=${DEBUG} -I${top_srcdir}/h -I${BUILDTOP}/h @CPPFLAGS@
+CPPFLAGS=@CPPFLAGS@
+CFLAGS=@CFLAGS@
+ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h ${CPPFLAGS}
 LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@
 LIBS=-lzephyr @LIBS@ -lcom_err
 
@@ -31,6 +32,9 @@ all: zstat
 zstat: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
+.c.o:
+	${CC} -c ${ALL_CFLAGS} $<
+
 check:
 
 install: zstat
diff --git a/clients/zwrite/Makefile.in b/clients/zwrite/Makefile.in
index b07423b..667175a 100644
--- a/clients/zwrite/Makefile.in
+++ b/clients/zwrite/Makefile.in
@@ -19,8 +19,9 @@ VPATH=@srcdir@
 CC=@CC@
 INSTALL=@INSTALL@
 
-DEBUG=-O
-CFLAGS=${DEBUG} -I${top_srcdir}/h -I${BUILDTOP}/h @CPPFLAGS@
+CPPFLAGS=@CPPFLAGS@
+CFLAGS=@CFLAGS@
+ALL_CFLAGS=${CFLAGS} -I${top_srcdir}/h -I${BUILDTOP}/h ${CPPFLAGS}
 LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@
 LIBS=-lzephyr @LIBS@ -lcom_err
 
@@ -31,6 +32,9 @@ all: zwrite
 zwrite: ${OBJS} ${BUILDTOP}/lib/libzephyr.a
 	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
 
+.c.o:
+	${CC} -c ${ALL_CFLAGS} $<
+
 check:
 
 install: zwrite