[FriBidi-commit] fribidi/lib Makefile.am, 1.13, 1.14 fribidi-types.h, 1.8, 1.9

[Behdad Esfahbod]

Update of /cvs/fribidi/fribidi/lib
In directory pdx:/tmp/cvs-serv9449/lib

Modified Files:
	Makefile.am fribidi-types.h 
Log Message:
Here and there fixes, found by trying to compile on sf.net Compile Farm!


Index: Makefile.am
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile.am	15 Jun 2004 20:54:00 -0000	1.13
+++ Makefile.am	3 Jul 2004 11:36:15 -0000	1.14
@@ -28,7 +28,8 @@
 endif # FRIBIDI_CHARSETS
 
 include Headers.mk
-pkginclude_HEADERS = $(libfribidi_la_headers) fribidi-config.h
+pkginclude_HEADERS = $(libfribidi_la_headers)
+nodist_pkginclude_HEADERS = fribidi-config.h
 
 libfribidi_la_SOURCES =	\
 		bidi-type.tab.i \
@@ -51,13 +52,17 @@
 		mirroring.tab.i \
 		run.h
 
-BUILT_SOURCES= \
+GENERATEDSOURCES = \
 		fribidi-unicode-version.h \
 		bidi-type.tab.i \
 		joining-type.tab.i \
 		mirroring.tab.i
 
-$(BUILT_SOURCES):
+BUILT_SOURCES = \
+		$(GENERATEDSOURCES) \
+		fribidi-config.h
+
+$(GENERATEDSOURCES):
 	@(cd $(top_builddir)/gen.tab && \
 	$(MAKE) $(AM_MAKEFLAGS) $@) && \
 	(test -f $@ || mv $(top_builddir)/gen.tab/$@ .)
@@ -73,3 +78,5 @@
 
 $(top_builddir)/config.h: $(top_srcdir)/config.h.in
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) config.h
+
+.PHONY: gen

Index: fribidi-types.h
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-types.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- fribidi-types.h	18 Jun 2004 19:21:33 -0000	1.8
+++ fribidi-types.h	3 Jul 2004 11:36:15 -0000	1.9
@@ -68,14 +68,7 @@
 #   define FRIBIDI_UINT32_LOCAL		unsigned long
 #  endif /* SIZEOF_INT < 4 */
 # endif	/* no int types */
-# if HAVE_STDBOOL_H
-#  ifndef __FRIBIDI_DOC
-#   include <stdbool.h>
-#  endif /* !__FRIBIDI_DOC */
-#  define FRIBIDI_BOOLEAN_LOCAL		bool
-# else /* !HAVE_STDBOOL_H */
-#  define FRIBIDI_BOOLEAN_LOCAL		int
-# endif	/* !HAVE_STDBOOL_H */
+# define FRIBIDI_BOOLEAN_LOCAL		int
 # if SIZEOF_WCHAR_T >= 4
 #  ifndef __FRIBIDI_DOC
 #   if STDC_HEADERS