MEM_OPTIMIZED option, fribidi_tables.i target and some more small changes

1 files changed, 66 insertions, 47 deletions

diff --git a/Makefile.am b/Makefile.am
index d365b3b..66210e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,53 +4,52 @@ INCLUDES = $(GLIB_CFLAGS)
 
 lib_LTLIBRARIES = libfribidi.la
 
-libfribidi_la_SOURCES = \
-	fribidi.c	    \
-	fribidi_tables.i    \
-	fribidi_types.c     \
-	fribidi_char_sets.c \
-	fribidi_char_sets_utf8.c       \
-	fribidi_char_sets_cap_rtl.c    \
-	fribidi_char_sets_iso8859_6.c  \
-	fribidi_char_sets_iso8859_8.c  \
-	fribidi_char_sets_cp1255.c     \
-	fribidi_char_sets_cp1256.c     \
-	fribidi_char_sets_isiri_3342.c \
-	fribidi_get_type.c             \
-	fribidi_utils.c
+libfribidi_la_SOURCES =	\
+	fribidi.c	\
+	fribidi_tables.i	\
+	fribidi_types.c		\
+	fribidi_get_type.c	\
+	fribidi_utils.c		\
+	fribidi_char_sets.c	\
+	fribidi_char_sets_utf8.c	\
+	fribidi_char_sets_cap_rtl.c	\
+	fribidi_char_sets_iso8859_6.c	\
+	fribidi_char_sets_iso8859_8.c	\
+	fribidi_char_sets_cp1255.c	\
+	fribidi_char_sets_cp1256.c	\
+	fribidi_char_sets_isiri_3342.c
 
 libfribidi_la_LIBADD = $(GLIB_LIBS)
 
 libfribidiincdir = $(includedir)/fribidi
 
 libfribidiincdir = $(includedir)/fribidi
-libfribidiinc_HEADERS = \
-	fribidi.h \
-	fribidi_char_sets_utf8.h       \
-	fribidi_char_sets_cap_rtl.h    \
-	fribidi_char_sets_iso8859_6.h  \
-	fribidi_char_sets_iso8859_8.h  \
-	fribidi_char_sets_cp1255.h     \
-	fribidi_char_sets_cp1256.h     \
-	fribidi_char_sets_isiri_3342.h \
-	fribidi_char_sets.h \
-	fribidi_types.h
-
-EXTRA_DIST = \
-        unidata/CreateGetType.pl \
-	tests/test-CapRTL \
-	tests/test-explicit \
-	tests/test-hebrew \
-	tests/test-CapRTL.reference \
-	tests/test-explicit.reference \
-	tests/test-hebrew.reference \
-	run.tests \
-	ANNOUNCE \
-	acinclude.m4 \
-        fribidi_mini_glib.h \
-	fribidi_mini_glib.c \
-        Makefile.noglib
-
+libfribidiinc_HEADERS =	\
+	fribidi.h	\
+	fribidi_types.h	\
+	fribidi_char_sets.h	\
+	fribidi_char_sets_cap_rtl.h	\
+	fribidi_char_sets_cp1255.h	\
+	fribidi_char_sets_cp1256.h	\
+	fribidi_char_sets_isiri_3342.h	\
+	fribidi_char_sets_iso8859_6.h	\
+	fribidi_char_sets_iso8859_8.h	\
+	fribidi_char_sets_utf8.h
+
+EXTRA_DIST =	\
+	run.tests	\
+	ANNOUNCE	\
+	acinclude.m4	\
+	fribidi_mini_glib.h	\
+	fribidi_mini_glib.c	\
+	Makefile.noglib	\
+	unidata/CreateGetType.pl	\
+	tests/test-CapRTL	\
+	tests/test-CapRTL.reference	\
+	tests/test-explicit	\
+	tests/test-explicit.reference	\
+	tests/test-hebrew	\
+	tests/test-hebrew.reference
 
 fribidi_benchmark_SOURCES = fribidi_benchmark.c
 fribidi_benchmark_LDADD = libfribidi.la $(GLIB_LIBS)
@@ -59,19 +58,39 @@ bin_PROGRAMS = fribidi
 fribidi_SOURCES = fribidi_main.c
 fribidi_LDADD = libfribidi.la $(GLIB_LIBS)
 
-tests/test-CapRTL.reference: fribidi tests/test-CapRTL 
-	mkdir -p tests
-	./fribidi --fill --showinput --charset CapRTL $(top_srcdir)/tests/test-CapRTL > \
+unidata/BidiMirroring.txt:
+	cd $(top_srcdir)/unidata &&	\
+	if ! test -f BididMirroring.txt ; then	\
+	    wget http://www.unicode.org/Public/UNIDATA/BidiMirroring.txt ;	\
+	fi
+
+unidata/PropList.txt:
+	cd $(top_srcdir)/unidata &&	\
+	if ! test -f PropList.txt ; then	\
+	    wget http://www.unicode.org/Public/UNIDATA/PropList.txt ;	\
+	fi
+
+fribidi_tables.i: unidata/CreateGetType.pl	\
+	unidata/BidiMirroring.txt unidata/PropList.txt
+	cd $(top_srcdir)/unidata &&	\
+	./CreateGetType.pl > ../fribidi_tables.i
+
+tests/test-CapRTL.reference: fribidi tests/test-CapRTL
+	./fribidi --test --charset CapRTL $(top_srcdir)/tests/test-CapRTL > \
 	$(top_srcdir)/tests/test-CapRTL.reference
 
-tests/test-explicit.reference: fribidi tests/test-explicit 
-	./fribidi --fill --showinput --charset CapRTL $(top_srcdir)/tests/test-explicit > \
+tests/test-explicit.reference: fribidi tests/test-explicit
+	./fribidi --test --charset CapRTL $(top_srcdir)/tests/test-explicit > \
 	$(top_srcdir)/tests/test-explicit.reference
 
 tests/test-hebrew.reference: fribidi tests/test-hebrew
-	./fribidi --fill --showinput --charset ISO8859-8 $(top_srcdir)/tests/test-hebrew > \
+	./fribidi --test --charset ISO8859-8 $(top_srcdir)/tests/test-hebrew > \
 	$(top_srcdir)/tests/test-hebrew.reference
 
+test.reference : tests/test-CapRTL.reference	\
+		tests/test-explicit.reference	\
+		tests/test-hebrew.reference
+
 test: fribidi
 	$(top_srcdir)/run.tests