Merge branch 'upstream' into tizen

12 files changed, 297 insertions, 110 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1752485..22b680a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -8,9 +8,7 @@ libfribidi_la_LDFLAGS = -no-undefined -version-info $(LT_VERSION_INFO)
 libfribidi_la_LIBADD =
 libfribidi_la_DEPENDENCIES =
 
-if OS_WIN32
-libfribidi_la_LDFLAGS += -export-symbols $(srcdir)/fribidi.def
-else
+if !OS_WIN32
 libfribidi_la_LDFLAGS += -export-symbols-regex "^fribidi_.*"
 endif # OS_WIN32
 
@@ -56,6 +54,8 @@ libfribidi_la_SOURCES =	\
 		brackets-type.tab.i \
 		run.h
 
+libfribidi_la_CPPFLAGS = @FRIBIDI_CPPFLAGS@ -DFRIBIDI_BUILD
+
 GENERATEDSOURCES = \
 		fribidi-unicode-version.h \
 		arabic-shaping.tab.i \
diff --git a/lib/Makefile.in b/lib/Makefile.in
index e9691d5..4f09036 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -89,8 +89,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@OS_WIN32_TRUE@am__append_1 = -export-symbols $(srcdir)/fribidi.def
-@OS_WIN32_FALSE@am__append_2 = -export-symbols-regex "^fribidi_.*"
+@OS_WIN32_FALSE@am__append_1 = -export-symbols-regex "^fribidi_.*"
 subdir = lib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
@@ -136,14 +135,22 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)" \
 	"$(DESTDIR)$(pkgincludedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
-am_libfribidi_la_OBJECTS = fribidi.lo fribidi-arabic.lo \
-	fribidi-bidi.lo fribidi-bidi-types.lo fribidi-char-sets.lo \
-	fribidi-char-sets-cap-rtl.lo fribidi-char-sets-cp1255.lo \
-	fribidi-char-sets-cp1256.lo fribidi-char-sets-iso8859-6.lo \
-	fribidi-char-sets-iso8859-8.lo fribidi-char-sets-utf8.lo \
-	fribidi-deprecated.lo fribidi-joining.lo \
-	fribidi-joining-types.lo fribidi-mirroring.lo \
-	fribidi-brackets.lo fribidi-run.lo fribidi-shape.lo
+am_libfribidi_la_OBJECTS = libfribidi_la-fribidi.lo \
+	libfribidi_la-fribidi-arabic.lo libfribidi_la-fribidi-bidi.lo \
+	libfribidi_la-fribidi-bidi-types.lo \
+	libfribidi_la-fribidi-char-sets.lo \
+	libfribidi_la-fribidi-char-sets-cap-rtl.lo \
+	libfribidi_la-fribidi-char-sets-cp1255.lo \
+	libfribidi_la-fribidi-char-sets-cp1256.lo \
+	libfribidi_la-fribidi-char-sets-iso8859-6.lo \
+	libfribidi_la-fribidi-char-sets-iso8859-8.lo \
+	libfribidi_la-fribidi-char-sets-utf8.lo \
+	libfribidi_la-fribidi-deprecated.lo \
+	libfribidi_la-fribidi-joining.lo \
+	libfribidi_la-fribidi-joining-types.lo \
+	libfribidi_la-fribidi-mirroring.lo \
+	libfribidi_la-fribidi-brackets.lo libfribidi_la-fribidi-run.lo \
+	libfribidi_la-fribidi-shape.lo
 libfribidi_la_OBJECTS = $(am_libfribidi_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -167,21 +174,24 @@ am__v_at_1 =
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/fribidi-arabic.Plo \
-	./$(DEPDIR)/fribidi-bidi-types.Plo \
-	./$(DEPDIR)/fribidi-bidi.Plo ./$(DEPDIR)/fribidi-brackets.Plo \
-	./$(DEPDIR)/fribidi-char-sets-cap-rtl.Plo \
-	./$(DEPDIR)/fribidi-char-sets-cp1255.Plo \
-	./$(DEPDIR)/fribidi-char-sets-cp1256.Plo \
-	./$(DEPDIR)/fribidi-char-sets-iso8859-6.Plo \
-	./$(DEPDIR)/fribidi-char-sets-iso8859-8.Plo \
-	./$(DEPDIR)/fribidi-char-sets-utf8.Plo \
-	./$(DEPDIR)/fribidi-char-sets.Plo \
-	./$(DEPDIR)/fribidi-deprecated.Plo \
-	./$(DEPDIR)/fribidi-joining-types.Plo \
-	./$(DEPDIR)/fribidi-joining.Plo \
-	./$(DEPDIR)/fribidi-mirroring.Plo ./$(DEPDIR)/fribidi-run.Plo \
-	./$(DEPDIR)/fribidi-shape.Plo ./$(DEPDIR)/fribidi.Plo
+am__depfiles_remade = ./$(DEPDIR)/libfribidi_la-fribidi-arabic.Plo \
+	./$(DEPDIR)/libfribidi_la-fribidi-bidi-types.Plo \
+	./$(DEPDIR)/libfribidi_la-fribidi-bidi.Plo \
+	./$(DEPDIR)/libfribidi_la-fribidi-brackets.Plo \
+	./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cap-rtl.Plo \
+	./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1255.Plo \
+	./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1256.Plo \
+	./$(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-6.Plo \
+	./$(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-8.Plo \
+	./$(DEPDIR)/libfribidi_la-fribidi-char-sets-utf8.Plo \
+	./$(DEPDIR)/libfribidi_la-fribidi-char-sets.Plo \
+	./$(DEPDIR)/libfribidi_la-fribidi-deprecated.Plo \
+	./$(DEPDIR)/libfribidi_la-fribidi-joining-types.Plo \
+	./$(DEPDIR)/libfribidi_la-fribidi-joining.Plo \
+	./$(DEPDIR)/libfribidi_la-fribidi-mirroring.Plo \
+	./$(DEPDIR)/libfribidi_la-fribidi-run.Plo \
+	./$(DEPDIR)/libfribidi_la-fribidi-shape.Plo \
+	./$(DEPDIR)/libfribidi_la-fribidi.Plo
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -263,6 +273,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FRIBIDI_BINARY_AGE = @FRIBIDI_BINARY_AGE@
+FRIBIDI_CPPFLAGS = @FRIBIDI_CPPFLAGS@
 FRIBIDI_INTERFACE_AGE = @FRIBIDI_INTERFACE_AGE@
 FRIBIDI_INTERFACE_VERSION = @FRIBIDI_INTERFACE_VERSION@
 FRIBIDI_MAJOR_VERSION = @FRIBIDI_MAJOR_VERSION@
@@ -372,7 +383,7 @@ EXTRA_DIST = fribidi.def
 lib_LTLIBRARIES = libfribidi.la
 AM_CPPFLAGS = 
 libfribidi_la_LDFLAGS = -no-undefined -version-info $(LT_VERSION_INFO) \
-	$(am__append_1) $(am__append_2)
+	$(am__append_1)
 libfribidi_la_LIBADD = 
 libfribidi_la_DEPENDENCIES = 
 libfribidi_la_headers = \
@@ -440,6 +451,7 @@ libfribidi_la_SOURCES = \
 		brackets-type.tab.i \
 		run.h
 
+libfribidi_la_CPPFLAGS = @FRIBIDI_CPPFLAGS@ -DFRIBIDI_BUILD
 GENERATEDSOURCES = \
 		fribidi-unicode-version.h \
 		arabic-shaping.tab.i \
@@ -536,24 +548,24 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-arabic.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-bidi-types.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-bidi.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-brackets.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-char-sets-cap-rtl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-char-sets-cp1255.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-char-sets-cp1256.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-char-sets-iso8859-6.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-char-sets-iso8859-8.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-char-sets-utf8.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-char-sets.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-deprecated.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-joining-types.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-joining.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-mirroring.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-run.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-shape.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-arabic.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-bidi-types.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-bidi.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-brackets.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cap-rtl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1255.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1256.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-6.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-8.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-char-sets-utf8.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-char-sets.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-deprecated.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-joining-types.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-joining.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-mirroring.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-run.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-shape.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi.Plo@am__quote@ # am--include-marker
 
 $(am__depfiles_remade):
 	@$(MKDIR_P) $(@D)
@@ -582,6 +594,132 @@ am--depfiles: $(am__depfiles_remade)
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
+libfribidi_la-fribidi.lo: fribidi.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi.Tpo -c -o libfribidi_la-fribidi.lo `test -f 'fribidi.c' || echo '$(srcdir)/'`fribidi.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi.Tpo $(DEPDIR)/libfribidi_la-fribidi.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fribidi.c' object='libfribidi_la-fribidi.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi.lo `test -f 'fribidi.c' || echo '$(srcdir)/'`fribidi.c
+
+libfribidi_la-fribidi-arabic.lo: fribidi-arabic.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-arabic.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-arabic.Tpo -c -o libfribidi_la-fribidi-arabic.lo `test -f 'fribidi-arabic.c' || echo '$(srcdir)/'`fribidi-arabic.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-arabic.Tpo $(DEPDIR)/libfribidi_la-fribidi-arabic.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fribidi-arabic.c' object='libfribidi_la-fribidi-arabic.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-arabic.lo `test -f 'fribidi-arabic.c' || echo '$(srcdir)/'`fribidi-arabic.c
+
+libfribidi_la-fribidi-bidi.lo: fribidi-bidi.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-bidi.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-bidi.Tpo -c -o libfribidi_la-fribidi-bidi.lo `test -f 'fribidi-bidi.c' || echo '$(srcdir)/'`fribidi-bidi.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-bidi.Tpo $(DEPDIR)/libfribidi_la-fribidi-bidi.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fribidi-bidi.c' object='libfribidi_la-fribidi-bidi.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-bidi.lo `test -f 'fribidi-bidi.c' || echo '$(srcdir)/'`fribidi-bidi.c
+
+libfribidi_la-fribidi-bidi-types.lo: fribidi-bidi-types.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-bidi-types.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-bidi-types.Tpo -c -o libfribidi_la-fribidi-bidi-types.lo `test -f 'fribidi-bidi-types.c' || echo '$(srcdir)/'`fribidi-bidi-types.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-bidi-types.Tpo $(DEPDIR)/libfribidi_la-fribidi-bidi-types.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fribidi-bidi-types.c' object='libfribidi_la-fribidi-bidi-types.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-bidi-types.lo `test -f 'fribidi-bidi-types.c' || echo '$(srcdir)/'`fribidi-bidi-types.c
+
+libfribidi_la-fribidi-char-sets.lo: fribidi-char-sets.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-char-sets.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-char-sets.Tpo -c -o libfribidi_la-fribidi-char-sets.lo `test -f 'fribidi-char-sets.c' || echo '$(srcdir)/'`fribidi-char-sets.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-char-sets.Tpo $(DEPDIR)/libfribidi_la-fribidi-char-sets.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fribidi-char-sets.c' object='libfribidi_la-fribidi-char-sets.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-char-sets.lo `test -f 'fribidi-char-sets.c' || echo '$(srcdir)/'`fribidi-char-sets.c
+
+libfribidi_la-fribidi-char-sets-cap-rtl.lo: fribidi-char-sets-cap-rtl.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-char-sets-cap-rtl.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-char-sets-cap-rtl.Tpo -c -o libfribidi_la-fribidi-char-sets-cap-rtl.lo `test -f 'fribidi-char-sets-cap-rtl.c' || echo '$(srcdir)/'`fribidi-char-sets-cap-rtl.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-char-sets-cap-rtl.Tpo $(DEPDIR)/libfribidi_la-fribidi-char-sets-cap-rtl.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fribidi-char-sets-cap-rtl.c' object='libfribidi_la-fribidi-char-sets-cap-rtl.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-char-sets-cap-rtl.lo `test -f 'fribidi-char-sets-cap-rtl.c' || echo '$(srcdir)/'`fribidi-char-sets-cap-rtl.c
+
+libfribidi_la-fribidi-char-sets-cp1255.lo: fribidi-char-sets-cp1255.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-char-sets-cp1255.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1255.Tpo -c -o libfribidi_la-fribidi-char-sets-cp1255.lo `test -f 'fribidi-char-sets-cp1255.c' || echo '$(srcdir)/'`fribidi-char-sets-cp1255.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1255.Tpo $(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1255.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fribidi-char-sets-cp1255.c' object='libfribidi_la-fribidi-char-sets-cp1255.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-char-sets-cp1255.lo `test -f 'fribidi-char-sets-cp1255.c' || echo '$(srcdir)/'`fribidi-char-sets-cp1255.c
+
+libfribidi_la-fribidi-char-sets-cp1256.lo: fribidi-char-sets-cp1256.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-char-sets-cp1256.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1256.Tpo -c -o libfribidi_la-fribidi-char-sets-cp1256.lo `test -f 'fribidi-char-sets-cp1256.c' || echo '$(srcdir)/'`fribidi-char-sets-cp1256.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1256.Tpo $(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1256.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fribidi-char-sets-cp1256.c' object='libfribidi_la-fribidi-char-sets-cp1256.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-char-sets-cp1256.lo `test -f 'fribidi-char-sets-cp1256.c' || echo '$(srcdir)/'`fribidi-char-sets-cp1256.c
+
+libfribidi_la-fribidi-char-sets-iso8859-6.lo: fribidi-char-sets-iso8859-6.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-char-sets-iso8859-6.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-6.Tpo -c -o libfribidi_la-fribidi-char-sets-iso8859-6.lo `test -f 'fribidi-char-sets-iso8859-6.c' || echo '$(srcdir)/'`fribidi-char-sets-iso8859-6.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-6.Tpo $(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-6.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fribidi-char-sets-iso8859-6.c' object='libfribidi_la-fribidi-char-sets-iso8859-6.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-char-sets-iso8859-6.lo `test -f 'fribidi-char-sets-iso8859-6.c' || echo '$(srcdir)/'`fribidi-char-sets-iso8859-6.c
+
+libfribidi_la-fribidi-char-sets-iso8859-8.lo: fribidi-char-sets-iso8859-8.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-char-sets-iso8859-8.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-8.Tpo -c -o libfribidi_la-fribidi-char-sets-iso8859-8.lo `test -f 'fribidi-char-sets-iso8859-8.c' || echo '$(srcdir)/'`fribidi-char-sets-iso8859-8.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-8.Tpo $(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-8.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fribidi-char-sets-iso8859-8.c' object='libfribidi_la-fribidi-char-sets-iso8859-8.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-char-sets-iso8859-8.lo `test -f 'fribidi-char-sets-iso8859-8.c' || echo '$(srcdir)/'`fribidi-char-sets-iso8859-8.c
+
+libfribidi_la-fribidi-char-sets-utf8.lo: fribidi-char-sets-utf8.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-char-sets-utf8.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-char-sets-utf8.Tpo -c -o libfribidi_la-fribidi-char-sets-utf8.lo `test -f 'fribidi-char-sets-utf8.c' || echo '$(srcdir)/'`fribidi-char-sets-utf8.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-char-sets-utf8.Tpo $(DEPDIR)/libfribidi_la-fribidi-char-sets-utf8.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fribidi-char-sets-utf8.c' object='libfribidi_la-fribidi-char-sets-utf8.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-char-sets-utf8.lo `test -f 'fribidi-char-sets-utf8.c' || echo '$(srcdir)/'`fribidi-char-sets-utf8.c
+
+libfribidi_la-fribidi-deprecated.lo: fribidi-deprecated.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-deprecated.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-deprecated.Tpo -c -o libfribidi_la-fribidi-deprecated.lo `test -f 'fribidi-deprecated.c' || echo '$(srcdir)/'`fribidi-deprecated.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-deprecated.Tpo $(DEPDIR)/libfribidi_la-fribidi-deprecated.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fribidi-deprecated.c' object='libfribidi_la-fribidi-deprecated.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-deprecated.lo `test -f 'fribidi-deprecated.c' || echo '$(srcdir)/'`fribidi-deprecated.c
+
+libfribidi_la-fribidi-joining.lo: fribidi-joining.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-joining.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-joining.Tpo -c -o libfribidi_la-fribidi-joining.lo `test -f 'fribidi-joining.c' || echo '$(srcdir)/'`fribidi-joining.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-joining.Tpo $(DEPDIR)/libfribidi_la-fribidi-joining.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fribidi-joining.c' object='libfribidi_la-fribidi-joining.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-joining.lo `test -f 'fribidi-joining.c' || echo '$(srcdir)/'`fribidi-joining.c
+
+libfribidi_la-fribidi-joining-types.lo: fribidi-joining-types.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-joining-types.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-joining-types.Tpo -c -o libfribidi_la-fribidi-joining-types.lo `test -f 'fribidi-joining-types.c' || echo '$(srcdir)/'`fribidi-joining-types.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-joining-types.Tpo $(DEPDIR)/libfribidi_la-fribidi-joining-types.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fribidi-joining-types.c' object='libfribidi_la-fribidi-joining-types.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-joining-types.lo `test -f 'fribidi-joining-types.c' || echo '$(srcdir)/'`fribidi-joining-types.c
+
+libfribidi_la-fribidi-mirroring.lo: fribidi-mirroring.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-mirroring.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-mirroring.Tpo -c -o libfribidi_la-fribidi-mirroring.lo `test -f 'fribidi-mirroring.c' || echo '$(srcdir)/'`fribidi-mirroring.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-mirroring.Tpo $(DEPDIR)/libfribidi_la-fribidi-mirroring.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fribidi-mirroring.c' object='libfribidi_la-fribidi-mirroring.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-mirroring.lo `test -f 'fribidi-mirroring.c' || echo '$(srcdir)/'`fribidi-mirroring.c
+
+libfribidi_la-fribidi-brackets.lo: fribidi-brackets.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-brackets.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-brackets.Tpo -c -o libfribidi_la-fribidi-brackets.lo `test -f 'fribidi-brackets.c' || echo '$(srcdir)/'`fribidi-brackets.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-brackets.Tpo $(DEPDIR)/libfribidi_la-fribidi-brackets.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fribidi-brackets.c' object='libfribidi_la-fribidi-brackets.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-brackets.lo `test -f 'fribidi-brackets.c' || echo '$(srcdir)/'`fribidi-brackets.c
+
+libfribidi_la-fribidi-run.lo: fribidi-run.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-run.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-run.Tpo -c -o libfribidi_la-fribidi-run.lo `test -f 'fribidi-run.c' || echo '$(srcdir)/'`fribidi-run.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-run.Tpo $(DEPDIR)/libfribidi_la-fribidi-run.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fribidi-run.c' object='libfribidi_la-fribidi-run.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-run.lo `test -f 'fribidi-run.c' || echo '$(srcdir)/'`fribidi-run.c
+
+libfribidi_la-fribidi-shape.lo: fribidi-shape.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-shape.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-shape.Tpo -c -o libfribidi_la-fribidi-shape.lo `test -f 'fribidi-shape.c' || echo '$(srcdir)/'`fribidi-shape.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-shape.Tpo $(DEPDIR)/libfribidi_la-fribidi-shape.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fribidi-shape.c' object='libfribidi_la-fribidi-shape.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-shape.lo `test -f 'fribidi-shape.c' || echo '$(srcdir)/'`fribidi-shape.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -762,24 +900,24 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
-		-rm -f ./$(DEPDIR)/fribidi-arabic.Plo
-	-rm -f ./$(DEPDIR)/fribidi-bidi-types.Plo
-	-rm -f ./$(DEPDIR)/fribidi-bidi.Plo
-	-rm -f ./$(DEPDIR)/fribidi-brackets.Plo
-	-rm -f ./$(DEPDIR)/fribidi-char-sets-cap-rtl.Plo
-	-rm -f ./$(DEPDIR)/fribidi-char-sets-cp1255.Plo
-	-rm -f ./$(DEPDIR)/fribidi-char-sets-cp1256.Plo
-	-rm -f ./$(DEPDIR)/fribidi-char-sets-iso8859-6.Plo
-	-rm -f ./$(DEPDIR)/fribidi-char-sets-iso8859-8.Plo
-	-rm -f ./$(DEPDIR)/fribidi-char-sets-utf8.Plo
-	-rm -f ./$(DEPDIR)/fribidi-char-sets.Plo
-	-rm -f ./$(DEPDIR)/fribidi-deprecated.Plo
-	-rm -f ./$(DEPDIR)/fribidi-joining-types.Plo
-	-rm -f ./$(DEPDIR)/fribidi-joining.Plo
-	-rm -f ./$(DEPDIR)/fribidi-mirroring.Plo
-	-rm -f ./$(DEPDIR)/fribidi-run.Plo
-	-rm -f ./$(DEPDIR)/fribidi-shape.Plo
-	-rm -f ./$(DEPDIR)/fribidi.Plo
+		-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-arabic.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-bidi-types.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-bidi.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-brackets.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cap-rtl.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1255.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1256.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-6.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-8.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-utf8.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-deprecated.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-joining-types.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-joining.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-mirroring.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-run.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-shape.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi.Plo
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -826,24 +964,24 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/fribidi-arabic.Plo
-	-rm -f ./$(DEPDIR)/fribidi-bidi-types.Plo
-	-rm -f ./$(DEPDIR)/fribidi-bidi.Plo
-	-rm -f ./$(DEPDIR)/fribidi-brackets.Plo
-	-rm -f ./$(DEPDIR)/fribidi-char-sets-cap-rtl.Plo
-	-rm -f ./$(DEPDIR)/fribidi-char-sets-cp1255.Plo
-	-rm -f ./$(DEPDIR)/fribidi-char-sets-cp1256.Plo
-	-rm -f ./$(DEPDIR)/fribidi-char-sets-iso8859-6.Plo
-	-rm -f ./$(DEPDIR)/fribidi-char-sets-iso8859-8.Plo
-	-rm -f ./$(DEPDIR)/fribidi-char-sets-utf8.Plo
-	-rm -f ./$(DEPDIR)/fribidi-char-sets.Plo
-	-rm -f ./$(DEPDIR)/fribidi-deprecated.Plo
-	-rm -f ./$(DEPDIR)/fribidi-joining-types.Plo
-	-rm -f ./$(DEPDIR)/fribidi-joining.Plo
-	-rm -f ./$(DEPDIR)/fribidi-mirroring.Plo
-	-rm -f ./$(DEPDIR)/fribidi-run.Plo
-	-rm -f ./$(DEPDIR)/fribidi-shape.Plo
-	-rm -f ./$(DEPDIR)/fribidi.Plo
+		-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-arabic.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-bidi-types.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-bidi.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-brackets.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cap-rtl.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1255.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1256.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-6.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-8.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-utf8.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-deprecated.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-joining-types.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-joining.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-mirroring.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-run.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi-shape.Plo
+	-rm -f ./$(DEPDIR)/libfribidi_la-fribidi.Plo
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/lib/fribidi-bidi-types.h b/lib/fribidi-bidi-types.h
index d243c5d..cfe3cf0 100644
--- a/lib/fribidi-bidi-types.h
+++ b/lib/fribidi-bidi-types.h
@@ -377,7 +377,7 @@ fribidi_get_bidi_type (
  * fribidi_get_bidi_type() for more information about the bidi types returned
  * by this function.
  */
-     FRIBIDI_ENTRY void fribidi_get_bidi_types (
+FRIBIDI_ENTRY void fribidi_get_bidi_types (
   const FriBidiChar *str,	/* input string */
   const FriBidiStrIndex len,	/* input string length */
   FriBidiCharType *btypes	/* output bidi types */
diff --git a/lib/fribidi-bidi.c b/lib/fribidi-bidi.c
index f3389bd..634546d 100644
--- a/lib/fribidi-bidi.c
+++ b/lib/fribidi-bidi.c
@@ -592,6 +592,7 @@ fribidi_get_par_embedding_levels_ex (
     } status_stack[FRIBIDI_BIDI_MAX_RESOLVED_LEVELS];
     FriBidiRun temp_link;
     FriBidiRun *run_per_isolate_level[FRIBIDI_BIDI_MAX_RESOLVED_LEVELS];
+    int prev_isolate_level = 0; /* When running over the isolate levels, remember the previous level */
 
     memset(run_per_isolate_level, 0, sizeof(run_per_isolate_level[0])
            * FRIBIDI_BIDI_MAX_RESOLVED_LEVELS);
@@ -782,9 +783,19 @@ fribidi_get_par_embedding_levels_ex (
     }
 
     /* Build the isolate_level connections */
+    prev_isolate_level = 0;
     for_run_list (pp, main_run_list)
     {
       int isolate_level = RL_ISOLATE_LEVEL (pp);
+      int i;
+
+      /* When going from an upper to a lower level, zero out all higher levels
+         in order not erroneous connections! */
+      if (isolate_level<prev_isolate_level)
+        for (i=isolate_level+1; i<=prev_isolate_level; i++)
+          run_per_isolate_level[i]=0;
+      prev_isolate_level = isolate_level;
+      
       if (run_per_isolate_level[isolate_level])
         {
           run_per_isolate_level[isolate_level]->next_isolate = pp;
@@ -824,7 +835,7 @@ fribidi_get_par_embedding_levels_ex (
 
   /* 4. Resolving weak types. Also calculate the maximum isolate level */
   max_iso_level = 0;
-  DBG ("resolving weak types");
+  DBG ("4a. resolving weak types");
   {
     int last_strong_stack[FRIBIDI_BIDI_MAX_RESOLVED_LEVELS];
     FriBidiCharType prev_type_orig;
@@ -902,9 +913,22 @@ fribidi_get_par_embedding_levels_ex (
 	}
     }
 
+# if DEBUG
+  if UNLIKELY
+    (fribidi_debug_status ())
+    {
+      print_resolved_levels (main_run_list);
+      print_resolved_types (main_run_list);
+    }
+# endif	/* DEBUG */
 
+    /* The last iso level is used to invalidate the the last strong values when going from
+       a higher to a lower iso level. When this occur, all "last_strong" values are
+       set to the base_dir. */
     last_strong_stack[0] = base_dir;
 
+    DBG ("4b. resolving weak types. W4 and W5");
+
     /* Resolving dependency of loops for rules W4 and W5, W5 may
        want to prevent W4 to take effect in the next turn, do this
        through "w4". */
@@ -1006,7 +1030,7 @@ fribidi_get_par_embedding_levels_ex (
 
   /* 5. Resolving Neutral Types */
 
-  DBG ("resolving neutral types - N0");
+  DBG ("5. resolving neutral types - N0");
   {
     /*  BD16 - Build list of all pairs*/
     int num_iso_levels = max_iso_level + 1;
diff --git a/lib/fribidi-bidi.h b/lib/fribidi-bidi.h
index 10672a6..4e3277c 100644
--- a/lib/fribidi-bidi.h
+++ b/lib/fribidi-bidi.h
@@ -118,7 +118,7 @@ fribidi_get_par_embedding_levels_ex (
  * Returns: Maximum level found in this line plus one, or zero if any error
  * occurred (memory allocation failure most probably).
  */
-     FRIBIDI_ENTRY FriBidiLevel fribidi_reorder_line (
+FRIBIDI_ENTRY FriBidiLevel fribidi_reorder_line (
   FriBidiFlags flags, /* reorder flags */
   const FriBidiCharType *bidi_types,	/* input list of bidi types as returned by
 					   fribidi_get_bidi_types() */
diff --git a/lib/fribidi-common.h b/lib/fribidi-common.h
index 4db1f22..0d80922 100644
--- a/lib/fribidi-common.h
+++ b/lib/fribidi-common.h
@@ -42,19 +42,29 @@
 
 
 /* FRIBIDI_ENTRY is a macro used to declare library entry points. */
-#ifndef FRIBIDI_ENTRY
-# if (defined(_MSC_VER) || defined(FRIBIDI_BUILT_WITH_MSVC)) && !defined(FRIBIDI_STATIC)
-/* if we're building fribidi itself with MSVC, FRIBIDI_ENTRY will be defined,
- * so if we're here then this is an external user including fribidi headers.
- * The dllimport is needed here mostly for the fribidi_version_info variable,
- * for functions it's not required. Probably needs more fine-tuning if
- * someone starts building fribidi as static library with MSVC. We'll cross
- * that bridge when we get there. */
-#  define FRIBIDI_ENTRY __declspec(dllimport) extern
+#ifndef FRIBIDI_LIB_STATIC
+# ifdef _WIN32
+#  ifdef FRIBIDI_BUILD
+#    define FRIBIDI_ENTRY __declspec(dllexport)
+#  else
+#    define FRIBIDI_ENTRY __declspec(dllimport)
+#  endif
+# elif (defined(__SUNPRO_C)  || defined(__SUNPRO_CC))
+#  define FRIBIDI_ENTRY __global
 # else
-#  define FRIBIDI_ENTRY extern
+#  if (defined(__GNUC__) && __GNUC__ >= 4) || defined(__ICC)
+#    define FRIBIDI_ENTRY __attribute__ ((visibility("default")))
+#  else
+#   define FRIBIDI_ENTRY
+#  endif
 # endif
-#endif /* !FRIBIDI_ENTRY */
+#else
+# ifndef FRIBIDI_ENTRY
+#   define FRIBIDI_ENTRY
+# endif
+#endif
+
+#define FRIBIDI_EXTERN extern
 
 #ifdef __ICC
 #define FRIBIDI_BEGIN_IGNORE_DEPRECATIONS               \
@@ -85,7 +95,7 @@
 #define FRIBIDI_END_IGNORE_DEPRECATIONS
 #endif
 
-#if defined(__GNUC__) && (__GNUC__ > 2)
+#if (defined(__GNUC__) && (__GNUC__ > 2)) && ! defined(_WIN32)
 # define FRIBIDI_GNUC_WARN_UNUSED __attribute__((__warn_unused_result__))
 # define FRIBIDI_GNUC_MALLOC      __attribute__((__malloc__))
 # define FRIBIDI_GNUC_HIDDEN      __attribute__((__visibility__ ("hidden")))
diff --git a/lib/fribidi-deprecated.c b/lib/fribidi-deprecated.c
index 7a97292..bc0b8e2 100644
--- a/lib/fribidi-deprecated.c
+++ b/lib/fribidi-deprecated.c
@@ -76,6 +76,19 @@ fribidi_reorder_nsm_status (
 
 
 
+FRIBIDI_ENTRY FriBidiLevel
+fribidi_log2vis_get_embedding_levels (
+  const FriBidiCharType *bidi_types,	/* input list of bidi types as returned by
+					   fribidi_get_bidi_types() */
+  const FriBidiStrIndex len,	/* input string length of the paragraph */
+  FriBidiParType *pbase_dir,	/* requested and resolved paragraph
+				 * base direction */
+  FriBidiLevel *embedding_levels	/* output list of embedding levels */
+)
+{
+  return fribidi_get_par_embedding_levels_ex (bidi_types, NULL, len, pbase_dir, embedding_levels);
+}
+
 FRIBIDI_ENTRY FriBidiCharType
 fribidi_get_type (
   FriBidiChar ch		/* input character */
diff --git a/lib/fribidi-deprecated.h b/lib/fribidi-deprecated.h
index 56b5ea3..cb2322d 100644
--- a/lib/fribidi-deprecated.h
+++ b/lib/fribidi-deprecated.h
@@ -41,7 +41,7 @@
  *
  * This function is deprecated and only used with other deprecated functions.
  */
-     FRIBIDI_ENTRY fribidi_boolean fribidi_mirroring_status (
+FRIBIDI_ENTRY fribidi_boolean fribidi_mirroring_status (
   void
 ) FRIBIDI_GNUC_DEPRECATED;
 
@@ -59,7 +59,7 @@
  *
  * Returns: the new mirroring status.
  */
-     FRIBIDI_ENTRY fribidi_boolean fribidi_set_mirroring (
+FRIBIDI_ENTRY fribidi_boolean fribidi_set_mirroring (
   fribidi_boolean state		/* new state to set */
 ) FRIBIDI_GNUC_DEPRECATED;
 
@@ -68,7 +68,7 @@
  *
  * This function is deprecated and only used with other deprecated functions.
  */
-     FRIBIDI_ENTRY fribidi_boolean fribidi_reorder_nsm_status (
+FRIBIDI_ENTRY fribidi_boolean fribidi_reorder_nsm_status (
   void
 ) FRIBIDI_GNUC_DEPRECATED;
 
@@ -88,7 +88,7 @@
  *
  * Returns: the new marks reordering status.
  */
-     FRIBIDI_ENTRY fribidi_boolean fribidi_set_reorder_nsm (
+FRIBIDI_ENTRY fribidi_boolean fribidi_set_reorder_nsm (
   fribidi_boolean state		/* new state to set */
 ) FRIBIDI_GNUC_DEPRECATED;
 
diff --git a/lib/fribidi-joining-types.h b/lib/fribidi-joining-types.h
index 7f6750a..99bbd80 100644
--- a/lib/fribidi-joining-types.h
+++ b/lib/fribidi-joining-types.h
@@ -222,7 +222,7 @@ fribidi_get_joining_type (
  * fribidi_get_joining_type for more information about the joining types
  * returned by this function.
  */
-     FRIBIDI_ENTRY void fribidi_get_joining_types (
+FRIBIDI_ENTRY void fribidi_get_joining_types (
   const FriBidiChar *str,	/* input string */
   const FriBidiStrIndex len,	/* input string length */
   FriBidiJoiningType *jtypes	/* output joining types */
@@ -237,7 +237,7 @@ fribidi_get_joining_type (
  * Joining Classes of the Unicode standard available at
  * http://www.unicode.org/versions/Unicode4.0.0/ch08.pdf#G7462.
  */
-     FRIBIDI_ENTRY const char *fribidi_get_joining_type_name (
+FRIBIDI_ENTRY const char *fribidi_get_joining_type_name (
   FriBidiJoiningType j		/* input joining type */
 ) FRIBIDI_GNUC_CONST;
 
diff --git a/lib/fribidi-unicode.h b/lib/fribidi-unicode.h
index 745a312..f5a5783 100644
--- a/lib/fribidi-unicode.h
+++ b/lib/fribidi-unicode.h
@@ -45,7 +45,7 @@
 
 /* An string containing the version the Unicode standard implemented,
  * in the form of "x.y.z", or "unknown". */
-FRIBIDI_ENTRY const char *fribidi_unicode_version;
+FRIBIDI_ENTRY FRIBIDI_EXTERN const char *fribidi_unicode_version;
 
 
 /* Unicode Bidirectional Algorithm definitions: */
diff --git a/lib/fribidi.h b/lib/fribidi.h
index 9124624..6157a3a 100644
--- a/lib/fribidi.h
+++ b/lib/fribidi.h
@@ -57,13 +57,13 @@
  * string, the other way. Moreover, the position maps should be filled with
  * valid entries.
  * 
- * A position map pointing to a removed character is filled with \-1. By the
+ * A position map pointing to a removed character is filled with \(mi1. By the
  * way, you should not use embedding_levels if str is visual string.
  * 
  * For best results this function should be run on a whole paragraph, not
  * lines; but feel free to do otherwise if you know what you are doing.
  *
- * Returns: New length of the string, or \-1 if an error occurred (memory
+ * Returns: New length of the string, or \(mi1 if an error occurred (memory
  * allocation failure most probably).
  */
 FRIBIDI_ENTRY FriBidiStrIndex
@@ -110,6 +110,8 @@ FRIBIDI_ENTRY FriBidiLevel fribidi_log2vis (
   FriBidiLevel *embedding_levels	/* output list of embedding levels */
 );
 
+/* End of functions */
+
 #ifdef FRIBIDI_NO_DEPRECATED
 #else
 # include "fribidi-deprecated.h"
@@ -117,7 +119,7 @@ FRIBIDI_ENTRY FriBidiLevel fribidi_log2vis (
 
 
 /* An string containing the version information of the library. */
-FRIBIDI_ENTRY const char *fribidi_version_info;
+FRIBIDI_ENTRY FRIBIDI_EXTERN const char *fribidi_version_info;
 
 #include "fribidi-enddecls.h"
 
diff --git a/lib/meson.build b/lib/meson.build
index 573d47f..aaf2aed 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -75,7 +75,7 @@ libfribidi = library('fribidi',
   fribidi_sources, fribidi_unicode_version_h, fribidi_config_h,
   generated_tab_include_files, config_h,
   include_directories: incs,
-  c_args: ['-DHAVE_CONFIG_H'] + visibility_args,
+  c_args: ['-DHAVE_CONFIG_H', '-DFRIBIDI_BUILD'] + fribidi_static_cargs + visibility_args,
   version: libversion,
   soversion: soversion,
   install: true)