diff options
-rw-r--r-- | clients/syslogd/Makefile.in | 8 | ||||
-rw-r--r-- | clients/xzwrite/Makefile.in | 10 | ||||
-rw-r--r-- | clients/zaway/Makefile.in | 8 | ||||
-rw-r--r-- | clients/zctl/Makefile.in | 8 | ||||
-rw-r--r-- | clients/zleave/Makefile.in | 8 | ||||
-rw-r--r-- | clients/zlocate/Makefile.in | 8 | ||||
-rw-r--r-- | clients/zmailnotify/Makefile.in | 8 | ||||
-rw-r--r-- | clients/znol/Makefile.in | 8 | ||||
-rw-r--r-- | clients/zpopnotify/Makefile.in | 8 | ||||
-rw-r--r-- | clients/zshutdown_notify/Makefile.in | 8 | ||||
-rw-r--r-- | clients/zstat/Makefile.in | 8 | ||||
-rw-r--r-- | clients/zwrite/Makefile.in | 8 | ||||
-rw-r--r-- | lib/Makefile.in | 10 | ||||
-rw-r--r-- | libdyn/Makefile.in | 8 | ||||
-rw-r--r-- | server/Makefile.in | 10 | ||||
-rw-r--r-- | zhm/Makefile.in | 8 | ||||
-rw-r--r-- | zwgc/Makefile.in | 21 |
17 files changed, 116 insertions, 39 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 diff --git a/lib/Makefile.in b/lib/Makefile.in index e044a0d..336bd6a 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -19,9 +19,10 @@ CC=@CC@ INSTALL=@INSTALL@ RANLIB=@RANLIB@ -DEBUG=-O -CFLAGS=${DEBUG} -DSYSCONFDIR=\"${sysconfdir}\" -I${top_srcdir}/h \ - -I${BUILDTOP}/h @CPPFLAGS@ +CPPFLAGS=@CPPFLAGS@ +CFLAGS=@CFLAGS@ +ALL_CFLAGS=${CFLAGS} -DSYSCONFDIR=\"${sysconfdir}\" -I${top_srcdir}/h \ + -I${BUILDTOP}/h ${CPPFLAGS} OBJS = zephyr_err.o ZAsyncLocate.o ZCkAuth.o ZCkIfNot.o ZClosePort.o \ ZCmpUID.o ZCmpUIDP.o ZFlsLocs.o ZFlsSubs.o ZFmtAuth.o ZFmtList.o \ @@ -43,6 +44,9 @@ zephyr_err.c ${BUILDTOP}/h/zephyr/zephyr_err.h: zephyr_err.et compile_et ${srcdir}/zephyr_err.et mv zephyr_err.h ${BUILDTOP}/h/zephyr +.c.o: + ${CC} -c ${ALL_CFLAGS} $< + check: install: libzephyr.a diff --git a/libdyn/Makefile.in b/libdyn/Makefile.in index a111191..655c6e3 100644 --- a/libdyn/Makefile.in +++ b/libdyn/Makefile.in @@ -18,8 +18,9 @@ VPATH=@srcdir@ CC=@CC@ RANLIB=@RANLIB@ -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} OBJS = dyn_append.o dyn_create.o dyn_debug.o dyn_delete.o dyn_insert.o \ dyn_paranoid.o dyn_put.o dyn_realloc.o dyn_size.o @@ -33,6 +34,9 @@ libdyn.a: ${OBJS} dyntest: libdyn.a dyntest.o ${CC} ${LDFLAGS} -o $@ dyntest.o libdyn.a +.c.o: + ${CC} -c ${ALL_CFLAGS} $< + check: install: diff --git a/server/Makefile.in b/server/Makefile.in index 4feb618..be4229f 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -18,9 +18,10 @@ VPATH=@srcdir@ CC=@CC@ INSTALL=@INSTALL@ -DEBUG=-O -CFLAGS=${DEBUG} -DSYSCONFDIR=\"${sysconfdir}\" -I${top_srcdir}/h \ - -I${BUILDTOP}/h -I. @CPPFLAGS@ +CPPFLAGS=@CPPFLAGS@ +CFLAGS=@CFLAGS@ +ALL_CFLAGS=${CFLAGS} -DSYSCONFDIR=\"${sysconfdir}\" -I${top_srcdir}/h \ + -I${BUILDTOP}/h -I. ${CPPFLAGS} LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @LDFLAGS@ LIBS=-lzephyr @LIBS@ -lcom_err @@ -41,6 +42,9 @@ version.o: version.h version.h: always sh ${srcdir}/new_vers.sh +.c.o: + ${CC} -c ${ALL_CFLAGS} $< + check: # No dependency on zephyrd, to avoid rebuilding version.o. diff --git a/zhm/Makefile.in b/zhm/Makefile.in index b4db7f2..71354f2 100644 --- a/zhm/Makefile.in +++ b/zhm/Makefile.in @@ -18,8 +18,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 @@ -30,6 +31,9 @@ all: zhm zhm: ${OBJS} ${BUILDTOP}/lib/libzephyr.a ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} +.c.o: + ${CC} -c ${ALL_CFLAGS} $< + check: install: zhm diff --git a/zwgc/Makefile.in b/zwgc/Makefile.in index 64e8b72..7cc95a8 100644 --- a/zwgc/Makefile.in +++ b/zwgc/Makefile.in @@ -21,9 +21,10 @@ YACC=@YACC@ INSTALL=@INSTALL@ INSTANTIATE=${srcdir}/instantiate -DEBUG=-O -CFLAGS=${DEBUG} -DDATADIR=\"${datadir}\" -I${top_srcdir}/h \ - -I${BUILDTOP}/h -I${srcdir} -I. @X_CFLAGS@ @CPPFLAGS@ +CPPFLAGS=@CPPFLAGS@ +CFLAGS=@CFLAGS@ +ALL_CFLAGS=${CFLAGS} -DDATADIR=\"${datadir}\" -I${top_srcdir}/h \ + -I${BUILDTOP}/h -I${srcdir} -I. @X_CFLAGS@ ${CPPFLAGS} YFLAGS=-d LDFLAGS=${DEBUG} -L${BUILDTOP}/lib @X_LIBS@ @LDFLAGS@ LIBS=-lzephyr @LIBS@ -lcom_err @X_PRE_LIBS@ @ZWGC_LIBX11@ @X_EXTRA_LIBS@ \ @@ -68,6 +69,17 @@ string_stack.h: stack.h xmode_stack.h: stack.h ${INSTANTIATE} ${srcdir} stack xmode +lexer.o: y.tab.h + +parser.o: y.tab.c y.tab.h + ${CC} -c ${ALL_CFLAGS} -o $@ y.tab.c + +y.tab.c y.tab.h: parser.y + ${YACC} ${YFLAGS} parser.y + +.c.o: + ${CC} -c ${ALL_CFLAGS} $< + check: install: zwgc @@ -80,6 +92,7 @@ clean: rm -f ${OBJS} zwgc port_dictionary.[ch] pointer_dictionary.[ch] rm -f unsigned_long_dictionary.[ch] string_dictionary.[ch] rm -f int_dictionary.[ch] char_stack.h string_stack.h xmode_stack.h + rm -f y.tab.[ch] ${OBJS}: ${top_srcdir}/h/sysdep.h ${BUILDTOP}/h/config.h zephyr.o: ${BUILDTOP}/h/zephyr/zephyr.h ${BUILDTOP}/h/zephyr/zephyr_err.h @@ -105,7 +118,7 @@ exec.o: new_memory.h exec.h eval.h node.h buffer.h port.h variables.h notice.h file.o: new_memory.h new_string.h error.h formatter.o: new_memory.h char_stack.h string_dictionary.h formatter.h formatter.o: text_operations.h -lexer.o: new_memory.h new_string.h int_dictionary.h lexer.h parser.h y.tab.h +lexer.o: new_memory.h new_string.h int_dictionary.h lexer.h parser.h main.o: new_memory.h zwgc.h parser.h node.h exec.h zephyr.h notice.h main.o: subscriptions.h file.h mux.h port.h variables.h main.h mux.o: mux.h error.h zwgc.h pointer.h |