diff options
| author |   espie <espie@openbsd.org> | 2007-11-24 15:45:08 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2007-11-24 15:45:08 +0000 |
| commit | 367c870c484f28b439a6905d8838b602559d044e (patch) | |
| tree | fa0981e12ccc152b76f9053e909761825743233f | |
| parent | fix yacc/lex parallel file generation (diff) | |
| download | wireguard-openbsd-367c870c484f28b439a6905d8838b602559d044e.tar.xz wireguard-openbsd-367c870c484f28b439a6905d8838b602559d044e.zip | |
parallel make fixes: $(YDR) produces several files, we need a timestamp.
Also fixes an explicit make instead of $(MAKE) and a missing dependency.
| -rw-r--r-- | usr.sbin/afs/lib/libarla/Makefile.rxdef.inc | 41 | ||||
| -rw-r--r-- | usr.sbin/afs/src/lib/ko/Makefile.in | 3 |
2 files changed, 9 insertions, 35 deletions
diff --git a/usr.sbin/afs/lib/libarla/Makefile.rxdef.inc b/usr.sbin/afs/lib/libarla/Makefile.rxdef.inc index eecc7895b94..0b4da759424 100644 --- a/usr.sbin/afs/lib/libarla/Makefile.rxdef.inc +++ b/usr.sbin/afs/lib/libarla/Makefile.rxdef.inc @@ -11,44 +11,17 @@ SRCS += vldb.cs.c \ bos.cs.c \ ka.cs.c -CLEANFILES += vldb.ss.c vldb.cs.c vldb.ydr.c vldb.ss.h vldb.cs.h vldb.h \ - fs.ss.c fs.cs.c fs.ydr.c fs.cs.h fs.ss.h fs.h \ - cb.ss.c cb.cs.c cb.ydr.c cb.cs.h cb.ss.h cb.h \ - pts.ss.c pts.cs.c pts.ydr.c pts.cs.h pts.ss.h pts.h \ - volumeserver.ss.c volumeserver.cs.c volumeserver.ydr.c \ - volumeserver.ss.h volumeserver.cs.h volumeserver.h \ - ubik.ss.c ubik.cs.c ubik.ydr.c ubik.cs.h ubik.ss.h ubik.h \ - bos.ss.c bos.cs.c bos.ydr.c bos.cs.h bos.ss.h bos.h \ - vldb.td.c fs.td.c cb.td.c pts.td.c volumeserver.td.c \ - ubik.td.c bos.td.c ka.cs.c ka.cs.h ka.h ka.ss.c ka.ss.h \ - ka.td.c ka.ydr.c - CFLAGS += -I${AFSSRC}/rxdef -I${AFSSRC}/arlad YDRFLAGS = -I${.CURDIR} .PATH: ${AFSSRC}/rxdef -vldb.cs.c vldb.cs.h vldb.ss.c vldb.ss.h vldb.ydr.c vldb.h: vldb.xg - $(YDR) $(YDRFLAGS) ${AFSSRC}/rxdef/vldb.xg - -fs.cs.c fs.cs.h fs.ss.c fs.ss.h fs.ydr.c fs.h: fs.xg - $(YDR) $(YDRFLAGS) ${AFSSRC}/rxdef/fs.xg - -cb.cs.c cb.cs.h cb.ss.c cb.ss.h cb.ydr.c cb.h: cb.xg - $(YDR) $(YDRFLAGS) ${AFSSRC}/rxdef/cb.xg - -pts.cs.c pts.cs.h pts.ss.c pts.ss.h pts.ydr.c pts.h: pts.xg - $(YDR) $(YDRFLAGS) ${AFSSRC}/rxdef/pts.xg - -volumeserver.cs.c volumeserver.cs.h volumeserver.ss.c volumeserver.ss.h volumeserver.ydr.c volumeserver.h: volumeserver.xg - $(YDR) $(YDRFLAGS) ${AFSSRC}/rxdef/volumeserver.xg - -ubik.cs.c ubik.cs.h ubik.ss.c ubik.ss.h ubik.ydr.c ubik.h: ubik.xg - $(YDR) $(YDRFLAGS) ${AFSSRC}/rxdef/ubik.xg - -bos.cs.c bos.cs.h bos.ss.c bos.ss.h bos.ydr.c bos.h: bos.xg - $(YDR) $(YDRFLAGS) ${AFSSRC}/rxdef/bos.xg +.for f in vldb fs cb pts volumeserver ubik bos ka -ka.cs.c ka.cs.h ka.ss.c ka.ss.h ka.ydr.c ka.h: ka.xg - $(YDR) $(YDRFLAGS) ${AFSSRC}/rxdef/ka.xg +stamp_$f: $f.xg + $(YDR) $(YDRFLAGS) ${AFSSRC}/rxdef/$f.xg + touch $@ +$f.cs.c $f.cs.h $f.ss.c $f.ss.h $f.ydr.c $f.h: stamp_$f +CLEANFILES+=$f.cs.c $f.cs.h $f.ss.c $f.ss.h $f.ydr.c $f.h $stamp_$f +.endfor diff --git a/usr.sbin/afs/src/lib/ko/Makefile.in b/usr.sbin/afs/src/lib/ko/Makefile.in index 8e1d39cfcd4..0d7725bfea8 100644 --- a/usr.sbin/afs/src/lib/ko/Makefile.in +++ b/usr.sbin/afs/src/lib/ko/Makefile.in @@ -102,7 +102,7 @@ OBJECTS = $(LIB_OBJECTS) all: $(LIB) $(PROGS) Wall: - make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__" + ${MAKE} CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__" sysname.c: gensysname ./gensysname -c > $@ @@ -110,6 +110,7 @@ sysname.c: gensysname .c.o: $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES) $(CFLAGS) $(PICFLAGS) $< +kocell.o: vldb.h volumeserver.h install: all $(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(INSTALL_DATA) $(LIB) $(DESTDIR)$(libdir)/$(LIB) |