summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2016-02-29 03:39:13 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2016-02-29 03:39:13 +0100
commit2f0b4c592b4f9fd3c6d5744a3bc077237ce9278d (patch)
tree210fa176b055efb2ea15a075f8e0abb15f686973
parent9019d6fc527882b8e09ca210e997b43a7b77c70f (diff)
Fix parallel build
* console-client/Makefile (parser.tab.h): Redefine the standard yacc rule to make it build the header too, to avoid concurrency between the standard yacc rule and the rule that builds the header. * sutils/Makefile (OBJS): Append .o suffix to $(progs) instead of .c.
-rw-r--r--console-client/Makefile6
-rw-r--r--sutils/Makefile2
2 files changed, 4 insertions, 4 deletions
diff --git a/console-client/Makefile b/console-client/Makefile
index 4ebdc824..1784d7cf 100644
--- a/console-client/Makefile
+++ b/console-client/Makefile
@@ -96,10 +96,10 @@ $(module-dir)/%: %
'-Wl,-(' $($*-LDLIBS) '-Wl,-)' $^
lex.c: lex.l parser.tab.h
-parser.tab.h: parser.y
+%.tab.h %.c: %.y
if $(YACC) $(YFLAGS) -d $<; then \
- mv y.tab.h $@; \
- rm y.tab.c; \
+ mv y.tab.h $*.tab.h; \
+ mv y.tab.c $*.c; \
fi
XKB_SRCS = xkb/compose.c xkb/kstoucs.c xkb/parser.y xkb/lex.l \
diff --git a/sutils/Makefile b/sutils/Makefile
index e30bfb77..f4e18110 100644
--- a/sutils/Makefile
+++ b/sutils/Makefile
@@ -27,7 +27,7 @@ special-targets = $(scripts)
installationdir = $(sbindir)
SRCS = $(progs:=.c) clookup.c fstab.c update.c $(scripts:=.sh)
-OBJS = $(progs:=.c)
+OBJS = $(progs:=.o)
HURDLIBS = store shouldbeinlibc
include ../Makeconf