From f137dd34258f7f10c482d32520bcb2a323b0ec71 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 9 Feb 2018 13:09:44 -0600 Subject: Try fixing parallel build from git checkout Fixes https://github.com/fribidi/fribidi/issues/52 --- gen.tab/Makefile.am | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gen.tab/Makefile.am b/gen.tab/Makefile.am index 2f43daa..3a87b96 100644 --- a/gen.tab/Makefile.am +++ b/gen.tab/Makefile.am @@ -8,12 +8,20 @@ EXTRA_PROGRAMS = \ gen-brackets-type-tab gen_unicode_version_SOURCES = gen-unicode-version.c +gen_arabic_shaping_tab_SOURCES = gen-arabic-shaping-tab.c gen_bidi_type_tab_SOURCES = gen-bidi-type-tab.c packtab.c packtab.h gen_joining_type_tab_SOURCES = gen-joining-type-tab.c packtab.c packtab.h -gen_arabic_shaping_tab_SOURCES = gen-arabic-shaping-tab.c gen_mirroring_tab_SOURCES = gen-mirroring-tab.c packtab.c packtab.h gen_brackets_tab_SOURCES = gen-brackets-tab.c packtab.c packtab.h gen_brackets_type_tab_SOURCES = gen-brackets-type-tab.c packtab.c packtab.h +# Set CPPFLAGS explicitly for these, such that they compile packtab.c to private +# packtab.o so they don't race during parallel build from lib. +# https://github.com/fribidi/fribidi/issues/52 +gen_bidi_type_tab_CPPFLAGS = $(AM_CPPFLAGS) +gen_joining_type_tab_CPPFLAGS = $(AM_CPPFLAGS) +gen_mirroring_tab_CPPFLAGS = $(AM_CPPFLAGS) +gen_brackets_tab_CPPFLAGS = $(AM_CPPFLAGS) +gen_brackets_type_tab_CPPFLAGS = $(AM_CPPFLAGS) CFLAGS_FOR_BUILD += -DHAVE_CONFIG_H -I$(top_builddir) -I$(top_builddir)/lib -I$(top_srcdir)/lib CC = $(CC_FOR_BUILD) -- cgit v1.2.1