Towards fixing out-of-tree builds

One cannot just call compiler like that. Sources files need to be
redirected through Make to be found correctly.  Let's see if overriding
CC and CFLAGS works.

This, still fails to build for me from a bootstrap repo and out-of-tree
build. Make seem to have become too smart for what I wrote before.
Still trying.

2 files changed, 13 insertions, 26 deletions

diff --git a/configure.ac b/configure.ac
index 312bdeb..974f334 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,8 +181,6 @@ fi
 fi
 AM_CONDITIONAL(FRIBIDI_USE_GLIB, test x$FRIBIDI_USE_GLIB = x1)
 
-CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD} -DHAVE_CONFIG_H -I.. -I../lib"
-
 # Generate output
 AC_CONFIG_FILES([fribidi.pc
 		 lib/fribidi-config.h
diff --git a/gen.tab/Makefile.am b/gen.tab/Makefile.am
index acf0741..2f43daa 100644
--- a/gen.tab/Makefile.am
+++ b/gen.tab/Makefile.am
@@ -15,6 +15,10 @@ 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
 
+CFLAGS_FOR_BUILD += -DHAVE_CONFIG_H -I$(top_builddir) -I$(top_builddir)/lib -I$(top_srcdir)/lib
+CC = $(CC_FOR_BUILD)
+CFLAGS = $(CFLAGS_FOR_BUILD)
+
 CLEANFILES = $(EXTRA_PROGRAMS)
 DISTCLEANFILES =
 
@@ -38,19 +42,10 @@ COMPRESSION = 2
 
 gen_bidi_type_tab = gen-bidi-type-tab$(EXEEXT)
 
-derived_bidi-type.tab.i: \
-		DerivedBidiClass.txt \
-		fribidi-unicode-version.h \
-		$(gen_bidi_type_tab_SOURCES)
-	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $(gen_bidi_type_tab) $(subst packtab.h,,$(gen_bidi_type_tab_SOURCES))
-	./$(gen_bidi_type_tab) $(COMPRESSION) $^ > $@ \
-	|| ($(RM) $@ && false)
-
 bidi-type.tab.i: \
 		unidata/UnicodeData.txt \
 		fribidi-unicode-version.h \
-		$(gen_bidi_type_tab_SOURCES)
-	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $(gen_bidi_type_tab) $(subst packtab.h,,$(gen_bidi_type_tab_SOURCES))
+		$(gen_bidi_type_tab)
 	./$(gen_bidi_type_tab) $(COMPRESSION) $^ > $@ \
 	|| ($(RM) $@ && false)
 
@@ -64,8 +59,7 @@ joining-type.tab.i: \
 		unidata/UnicodeData.txt \
 		unidata/ArabicShaping.txt \
 		fribidi-unicode-version.h \
-		$(gen_joining_type_tab_SOURCES)
-	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $(gen_joining_type_tab) $(subst packtab.h,,$(gen_joining_type_tab_SOURCES))
+		$(gen_joining_type_tab)
 	./$(gen_joining_type_tab) $(COMPRESSION) $^ > $@ \
 	|| ($(RM) $@ && false)
 
@@ -76,8 +70,7 @@ gen_arabic_shaping_tab = gen-arabic-shaping-tab$(EXEEXT)
 arabic-shaping.tab.i: \
 		unidata/UnicodeData.txt \
 		fribidi-unicode-version.h \
-		$(gen_arabic_shaping_tab_SOURCES)
-	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $(gen_arabic_shaping_tab) $(gen_arabic_shaping_tab_SOURCES)
+		$(gen_arabic_shaping_tab)
 	./$(gen_arabic_shaping_tab) $(COMPRESSION) $^ > $@ \
 	|| ($(RM) $@ && false)
 
@@ -88,8 +81,7 @@ gen_mirroring_tab = gen-mirroring-tab$(EXEEXT)
 mirroring.tab.i: \
 		unidata/BidiMirroring.txt \
 		fribidi-unicode-version.h \
-		$(gen_mirroring_tab_SOURCES)
-	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $(gen_mirroring_tab) $(subst packtab.h,,$(gen_mirroring_tab_SOURCES))
+		$(gen_mirroring_tab)
 	./$(gen_mirroring_tab) $(COMPRESSION) $^ > $@ \
 	|| ($(RM) $@ && false)
 
@@ -101,8 +93,7 @@ brackets.tab.i: \
 		unidata/BidiBrackets.txt \
 		unidata/UnicodeData.txt \
 		fribidi-unicode-version.h \
-		$(gen_brackets_tab_SOURCES)
-	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $(gen_brackets_tab) $(subst packtab.h,,$(gen_brackets_tab_SOURCES))
+		$(gen_brackets_tab)
 	./$(gen_brackets_tab) $(COMPRESSION) $^ > $@ \
 	|| ($(RM) $@ && false)
 
@@ -113,8 +104,7 @@ gen_brackets_type_tab = gen-brackets-type-tab$(EXEEXT)
 brackets-type.tab.i: \
 		unidata/BidiBrackets.txt \
 		fribidi-unicode-version.h \
-		$(gen_brackets_type_tab_SOURCES)
-	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $(gen_brackets_type_tab) $(subst packtab.h,,$(gen_brackets_type_tab_SOURCES))
+		$(gen_brackets_type_tab)
 	./$(gen_brackets_type_tab) $(COMPRESSION) $^ > $@ \
 	|| ($(RM) $@ && false)
 
@@ -125,8 +115,7 @@ gen_unicode_version = gen-unicode-version$(EXEEXT)
 fribidi-unicode-version.h: \
 		unidata/ReadMe.txt \
 		unidata/BidiMirroring.txt \
-		$(gen_unicode_version_SOURCES)
-	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $(gen_unicode_version) $(gen_unicode_version_SOURCES)
+		$(gen_unicode_version)
 	./$(gen_unicode_version) $^ > $@ \
 	|| ($(RM) $@ && false)
 
@@ -134,10 +123,10 @@ fribidi-unicode-version.h: \
 gen: $(EXTRA_PROGRAMS)
 
 $(top_builddir)/config.h: $(top_srcdir)/config.h.in
-	cd $(top_builddir) && $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o config.h
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) config.h
 
 $(top_builddir)/lib/fribidi-config.h: $(top_srcdir)/lib/fribidi-config.h.in
-	cd $(top_builddir)/lib && $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o fribidi-config.h
+	cd $(top_builddir)/lib && $(MAKE) $(AM_MAKEFLAGS) fribidi-config.h
 
 .PHONY: gen