Imported Upstream version 1.6.0+dfsg

1 files changed, 159 insertions, 115 deletions

diff --git a/lib/Makefile.in b/lib/Makefile.in
index fec7695..8137b9b 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -64,7 +64,10 @@ DIST_COMMON = README $(pkginclude_HEADERS) \
 subdir = lib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \
-	$(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -96,9 +99,10 @@ am__libsword_la_SOURCES_DIST = $(keysdir)/swkey.cpp \
 	$(utilfunsdir)/zlib/untgz.c $(utilfunsdir)/ftplib.c \
 	$(utilfunsdir)/regex.c $(utilfunsdir)/roman.cpp \
 	$(mgrdir)/ftplibftpt.cpp $(mgrdir)/curlftpt.cpp \
-	$(mgrdir)/swconfig.cpp $(mgrdir)/swmgr.cpp \
-	$(mgrdir)/swfiltermgr.cpp $(mgrdir)/encfiltmgr.cpp \
-	$(mgrdir)/markupfiltmgr.cpp $(mgrdir)/filemgr.cpp \
+	$(mgrdir)/curlhttpt.cpp $(mgrdir)/swconfig.cpp \
+	$(mgrdir)/swmgr.cpp $(mgrdir)/swfiltermgr.cpp \
+	$(mgrdir)/encfiltmgr.cpp $(mgrdir)/markupfiltmgr.cpp \
+	$(mgrdir)/filemgr.cpp $(mgrdir)/versemgr.cpp \
 	$(mgrdir)/ftptrans.cpp $(mgrdir)/swlocale.cpp \
 	$(mgrdir)/localemgr.cpp $(mgrdir)/swcacher.cpp \
 	$(mgrdir)/swsearchable.cpp $(mgrdir)/installmgr.cpp \
@@ -113,10 +117,10 @@ am__libsword_la_SOURCES_DIST = $(keysdir)/swkey.cpp \
 	$(filtersdir)/swbasicfilter.cpp $(filtersdir)/swoptfilter.cpp \
 	$(filtersdir)/latin1utf8.cpp $(filtersdir)/latin1utf16.cpp \
 	$(filtersdir)/utf8utf16.cpp $(filtersdir)/utf16utf8.cpp \
-	$(filtersdir)/scsuutf8.cpp $(filtersdir)/utf8html.cpp \
-	$(filtersdir)/utf8latin1.cpp \
+	$(filtersdir)/utf8html.cpp $(filtersdir)/utf8latin1.cpp \
 	$(filtersdir)/utf8cantillation.cpp \
 	$(filtersdir)/utf8hebrewpoints.cpp \
+	$(filtersdir)/utf8arabicpoints.cpp \
 	$(filtersdir)/utf8greekaccents.cpp $(filtersdir)/cipherfil.cpp \
 	$(filtersdir)/utf8transliterator.cpp $(filtersdir)/utf8nfc.cpp \
 	$(filtersdir)/utf8nfkd.cpp $(filtersdir)/utf8arshaping.cpp \
@@ -130,10 +134,11 @@ am__libsword_la_SOURCES_DIST = $(keysdir)/swkey.cpp \
 	$(filtersdir)/osisscripref.cpp $(filtersdir)/osisvariants.cpp \
 	$(filtersdir)/osiswordjs.cpp \
 	$(filtersdir)/osismorphsegmentation.cpp \
-	$(filtersdir)/gbfhtml.cpp $(filtersdir)/gbfhtmlhref.cpp \
-	$(filtersdir)/gbfwebif.cpp $(filtersdir)/gbfplain.cpp \
-	$(filtersdir)/gbfrtf.cpp $(filtersdir)/gbfstrongs.cpp \
-	$(filtersdir)/gbffootnotes.cpp $(filtersdir)/gbfheadings.cpp \
+	$(filtersdir)/osisruby.cpp $(filtersdir)/gbfhtml.cpp \
+	$(filtersdir)/gbfhtmlhref.cpp $(filtersdir)/gbfwebif.cpp \
+	$(filtersdir)/gbfplain.cpp $(filtersdir)/gbfrtf.cpp \
+	$(filtersdir)/gbfstrongs.cpp $(filtersdir)/gbffootnotes.cpp \
+	$(filtersdir)/gbfheadings.cpp \
 	$(filtersdir)/gbfredletterwords.cpp $(filtersdir)/gbfmorph.cpp \
 	$(filtersdir)/gbfwordjs.cpp $(filtersdir)/thmlstrongs.cpp \
 	$(filtersdir)/thmlfootnotes.cpp $(filtersdir)/thmlheadings.cpp \
@@ -162,7 +167,7 @@ am__libsword_la_SOURCES_DIST = $(keysdir)/swkey.cpp \
 @INTERNALFTPLIB_TRUE@am__objects_2 = ftplib.lo
 @MINGW_TRUE@am__objects_3 = regex.lo
 @WITHCURL_FALSE@am__objects_4 = ftplibftpt.lo
-@WITHCURL_TRUE@am__objects_4 = curlftpt.lo
+@WITHCURL_TRUE@am__objects_4 = curlftpt.lo curlhttpt.lo
 @ZLIB_TRUE@am__objects_5 = zipcomprs.lo
 am__objects_6 = utf8transliterator.lo utf8nfc.lo utf8nfkd.lo \
 	utf8arshaping.lo utf8bidireorder.lo
@@ -171,7 +176,8 @@ am__objects_6 = utf8transliterator.lo utf8nfc.lo utf8nfkd.lo \
 am__objects_8 = osisheadings.lo osisfootnotes.lo osishtmlhref.lo \
 	osiswebif.lo osismorph.lo osisstrongs.lo osisplain.lo \
 	osisrtf.lo osislemma.lo osisredletterwords.lo osisscripref.lo \
-	osisvariants.lo osiswordjs.lo osismorphsegmentation.lo
+	osisvariants.lo osiswordjs.lo osismorphsegmentation.lo \
+	osisruby.lo
 am__objects_9 = gbfhtml.lo gbfhtmlhref.lo gbfwebif.lo gbfplain.lo \
 	gbfrtf.lo gbfstrongs.lo gbffootnotes.lo gbfheadings.lo \
 	gbfredletterwords.lo gbfmorph.lo gbfwordjs.lo
@@ -190,25 +196,26 @@ am_libsword_la_OBJECTS = swkey.lo listkey.lo strkey.lo treekey.lo \
 	ftpparse.lo url.lo $(am__objects_1) $(am__objects_2) \
 	$(am__objects_3) roman.lo $(am__objects_4) swconfig.lo \
 	swmgr.lo swfiltermgr.lo encfiltmgr.lo markupfiltmgr.lo \
-	filemgr.lo ftptrans.lo swlocale.lo localemgr.lo swcacher.lo \
-	swsearchable.lo installmgr.lo stringmgr.lo swdisp.lo swlog.lo \
-	swmodule.lo rawstr.lo rawstr4.lo swcomprs.lo lzsscomprs.lo \
-	$(am__objects_5) rawverse.lo rawverse4.lo swcipher.lo \
-	zverse.lo zstr.lo entriesblk.lo sapphire.lo swbasicfilter.lo \
-	swoptfilter.lo latin1utf8.lo latin1utf16.lo utf8utf16.lo \
-	utf16utf8.lo scsuutf8.lo utf8html.lo utf8latin1.lo \
-	utf8cantillation.lo utf8hebrewpoints.lo utf8greekaccents.lo \
-	cipherfil.lo $(am__objects_7) $(am__objects_8) \
-	$(am__objects_9) $(am__objects_10) $(am__objects_11) \
-	$(am__objects_12) $(am__objects_13) swgenbook.lo rawgenbook.lo \
-	swtext.lo rawtext.lo rawtext4.lo ztext.lo swcom.lo rawcom.lo \
-	rawcom4.lo rawfiles.lo zcom.lo hrefcom.lo swld.lo rawld.lo \
-	rawld4.lo zld.lo flatapi.lo
+	filemgr.lo versemgr.lo ftptrans.lo swlocale.lo localemgr.lo \
+	swcacher.lo swsearchable.lo installmgr.lo stringmgr.lo \
+	swdisp.lo swlog.lo swmodule.lo rawstr.lo rawstr4.lo \
+	swcomprs.lo lzsscomprs.lo $(am__objects_5) rawverse.lo \
+	rawverse4.lo swcipher.lo zverse.lo zstr.lo entriesblk.lo \
+	sapphire.lo swbasicfilter.lo swoptfilter.lo latin1utf8.lo \
+	latin1utf16.lo utf8utf16.lo utf16utf8.lo utf8html.lo \
+	utf8latin1.lo utf8cantillation.lo utf8hebrewpoints.lo \
+	utf8arabicpoints.lo utf8greekaccents.lo cipherfil.lo \
+	$(am__objects_7) $(am__objects_8) $(am__objects_9) \
+	$(am__objects_10) $(am__objects_11) $(am__objects_12) \
+	$(am__objects_13) swgenbook.lo rawgenbook.lo swtext.lo \
+	rawtext.lo rawtext4.lo ztext.lo swcom.lo rawcom.lo rawcom4.lo \
+	rawfiles.lo zcom.lo hrefcom.lo swld.lo rawld.lo rawld4.lo \
+	zld.lo flatapi.lo
 libsword_la_OBJECTS = $(am_libsword_la_OBJECTS)
 libsword_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(libsword_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -238,7 +245,7 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_CXXFLAGS = @AM_CXXFLAGS@
+AM_CXXFLAGS = @AM_CXXFLAGS@ $(am__append_1)
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -261,19 +268,19 @@ CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@ $(am__append_1)
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 GENCCODE = @GENCCODE@
 GENCMN = @GENCMN@
 GENRB = @GENRB@
@@ -287,17 +294,23 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -320,7 +333,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -354,6 +367,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -372,15 +386,16 @@ target_mingw32 = @target_mingw32@
 target_os = @target_os@
 target_system = @target_system@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_conf = @with_conf@
 with_icu = @with_icu@
 with_zlib = @with_zlib@
 AUTOMAKE_OPTIONS = 1.6
-AM_CPPFLAGS = -I$(top_srcdir)/include -DUSE_AUTOTOOLS -DUNIX -Dunix \
-	-D__unix__ $(ZLIBDEF) $(ICUDEF) $(globdef) -D_FTPLIB_NO_COMPAT \
-	$(ICUDEFS)
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(includedir) -DUSE_AUTOTOOLS \
+	-DUNIX -Dunix -D__unix__ $(ZLIBDEF) $(ICUDEF) $(globdef) \
+	-D_FTPLIB_NO_COMPAT $(ICUDEFS)
 @ZLIB_FALSE@ZLIBDEF = -DEXCLUDEZLIB
 @ZLIB_TRUE@ZLIBDEF = 
 
@@ -398,24 +413,25 @@ libsword_la_SOURCES = $(keysdir)/swkey.cpp $(keysdir)/listkey.cpp \
 	$(utilfunsdir)/roman.cpp $(FTP_SOURCES) $(mgrdir)/swconfig.cpp \
 	$(mgrdir)/swmgr.cpp $(mgrdir)/swfiltermgr.cpp \
 	$(mgrdir)/encfiltmgr.cpp $(mgrdir)/markupfiltmgr.cpp \
-	$(mgrdir)/filemgr.cpp $(mgrdir)/ftptrans.cpp \
-	$(mgrdir)/swlocale.cpp $(mgrdir)/localemgr.cpp \
-	$(mgrdir)/swcacher.cpp $(mgrdir)/swsearchable.cpp \
-	$(mgrdir)/installmgr.cpp $(mgrdir)/stringmgr.cpp \
-	$(frontenddir)/swdisp.cpp $(frontenddir)/swlog.cpp \
-	$(modulesdir)/swmodule.cpp $(commondir)/rawstr.cpp \
-	$(commondir)/rawstr4.cpp $(commondir)/swcomprs.cpp \
-	$(commondir)/lzsscomprs.cpp $(SWZLIB) \
-	$(commondir)/rawverse.cpp $(commondir)/rawverse4.cpp \
+	$(mgrdir)/filemgr.cpp $(mgrdir)/versemgr.cpp \
+	$(mgrdir)/ftptrans.cpp $(mgrdir)/swlocale.cpp \
+	$(mgrdir)/localemgr.cpp $(mgrdir)/swcacher.cpp \
+	$(mgrdir)/swsearchable.cpp $(mgrdir)/installmgr.cpp \
+	$(mgrdir)/stringmgr.cpp $(frontenddir)/swdisp.cpp \
+	$(frontenddir)/swlog.cpp $(modulesdir)/swmodule.cpp \
+	$(commondir)/rawstr.cpp $(commondir)/rawstr4.cpp \
+	$(commondir)/swcomprs.cpp $(commondir)/lzsscomprs.cpp \
+	$(SWZLIB) $(commondir)/rawverse.cpp $(commondir)/rawverse4.cpp \
 	$(commondir)/swcipher.cpp $(commondir)/zverse.cpp \
 	$(commondir)/zstr.cpp $(commondir)/entriesblk.cpp \
 	$(commondir)/sapphire.cpp $(filtersdir)/swbasicfilter.cpp \
 	$(filtersdir)/swoptfilter.cpp $(filtersdir)/latin1utf8.cpp \
 	$(filtersdir)/latin1utf16.cpp $(filtersdir)/utf8utf16.cpp \
-	$(filtersdir)/utf16utf8.cpp $(filtersdir)/scsuutf8.cpp \
-	$(filtersdir)/utf8html.cpp $(filtersdir)/utf8latin1.cpp \
+	$(filtersdir)/utf16utf8.cpp $(filtersdir)/utf8html.cpp \
+	$(filtersdir)/utf8latin1.cpp \
 	$(filtersdir)/utf8cantillation.cpp \
 	$(filtersdir)/utf8hebrewpoints.cpp \
+	$(filtersdir)/utf8arabicpoints.cpp \
 	$(filtersdir)/utf8greekaccents.cpp $(filtersdir)/cipherfil.cpp \
 	$(SWREALICUSRC) $(OSISFIL) $(GBFFIL) $(THMLFIL) $(CONVFIL) \
 	$(PLFIL) $(TEIFIL) $(genbookdir)/swgenbook.cpp \
@@ -449,7 +465,8 @@ mgrdir = $(top_srcdir)/src/mgr
 @CONFDEF_FALSE@globdef = 
 @CONFDEF_TRUE@globdef = -DGLOBCONFPATH=\"${globalconfdir}/sword.conf\"
 @WITHCURL_FALSE@FTP_SOURCES = $(mgrdir)/ftplibftpt.cpp
-@WITHCURL_TRUE@FTP_SOURCES = $(mgrdir)/curlftpt.cpp
+@WITHCURL_TRUE@FTP_SOURCES = $(mgrdir)/curlftpt.cpp \
+@WITHCURL_TRUE@	$(mgrdir)/curlhttpt.cpp
 frontenddir = $(top_srcdir)/src/frontend
 modulesdir = $(top_srcdir)/src/modules
 commondir = $(top_srcdir)/src/modules/common
@@ -482,7 +499,8 @@ OSISFIL = $(filtersdir)/osisheadings.cpp \
 	$(filtersdir)/osisredletterwords.cpp \
 	$(filtersdir)/osisscripref.cpp $(filtersdir)/osisvariants.cpp \
 	$(filtersdir)/osiswordjs.cpp \
-	$(filtersdir)/osismorphsegmentation.cpp
+	$(filtersdir)/osismorphsegmentation.cpp \
+	$(filtersdir)/osisruby.cpp
 PLFIL = $(filtersdir)/rtfhtml.cpp $(filtersdir)/plainfootnotes.cpp \
 	$(filtersdir)/plainhtml.cpp $(filtersdir)/greeklexattribs.cpp \
 	$(filtersdir)/unicodertf.cpp $(filtersdir)/papyriplain.cpp
@@ -521,27 +539,29 @@ bindingsdir = $(top_srcdir)/bindings
 swincludedir = $(top_srcdir)/include
 pkginclude_HEADERS = $(swincludedir)/Greek2Greek.h \
 	$(swincludedir)/GreekChars.h $(swincludedir)/canon.h \
-	$(swincludedir)/cipherfil.h $(swincludedir)/curlftpt.h \
+	$(swincludedir)/canon_abbrevs.h $(swincludedir)/cipherfil.h \
+	$(swincludedir)/curlftpt.h $(swincludedir)/curlhttpt.h \
 	$(swincludedir)/defs.h $(swincludedir)/echomod.h \
 	$(swincludedir)/encfiltmgr.h $(swincludedir)/entriesblk.h \
 	$(swincludedir)/femain.h $(swincludedir)/filemgr.h \
-	$(swincludedir)/flatapi.h $(swincludedir)/ftpparse.h \
-	$(swincludedir)/ftptrans.h $(swincludedir)/ftplibftpt.h \
-	$(swincludedir)/ftplib.h $(swincludedir)/gbffootnotes.h \
-	$(swincludedir)/gbfheadings.h $(swincludedir)/gbfhtml.h \
-	$(swincludedir)/gbfhtmlhref.h $(swincludedir)/gbfwebif.h \
-	$(swincludedir)/gbfmorph.h $(swincludedir)/gbfosis.h \
-	$(swincludedir)/gbfplain.h $(swincludedir)/gbfredletterwords.h \
-	$(swincludedir)/gbfrtf.h $(swincludedir)/gbfstrongs.h \
-	$(swincludedir)/gbfwordjs.h $(swincludedir)/gbfthml.h \
-	$(swincludedir)/greeklexattribs.h $(swincludedir)/hebrewmcim.h \
-	$(swincludedir)/hrefcom.h $(swincludedir)/installmgr.h \
-	$(swincludedir)/latin1utf16.h $(swincludedir)/latin1utf8.h \
-	$(swincludedir)/listkey.h $(swincludedir)/localemgr.h \
-	$(swincludedir)/lzsscomprs.h $(swincludedir)/markupfiltmgr.h \
-	$(swincludedir)/multimapwdef.h $(swincludedir)/nullim.h \
-	$(swincludedir)/osisheadings.h $(swincludedir)/osishtmlhref.h \
-	$(swincludedir)/osiswebif.h $(swincludedir)/osismorph.h \
+	$(swincludedir)/versemgr.h $(swincludedir)/flatapi.h \
+	$(swincludedir)/ftpparse.h $(swincludedir)/ftptrans.h \
+	$(swincludedir)/ftplibftpt.h $(swincludedir)/ftplib.h \
+	$(swincludedir)/gbffootnotes.h $(swincludedir)/gbfheadings.h \
+	$(swincludedir)/gbfhtml.h $(swincludedir)/gbfhtmlhref.h \
+	$(swincludedir)/gbfwebif.h $(swincludedir)/gbfmorph.h \
+	$(swincludedir)/gbfosis.h $(swincludedir)/gbfplain.h \
+	$(swincludedir)/gbfredletterwords.h $(swincludedir)/gbfrtf.h \
+	$(swincludedir)/gbfstrongs.h $(swincludedir)/gbfwordjs.h \
+	$(swincludedir)/gbfthml.h $(swincludedir)/greeklexattribs.h \
+	$(swincludedir)/hebrewmcim.h $(swincludedir)/hrefcom.h \
+	$(swincludedir)/installmgr.h $(swincludedir)/latin1utf16.h \
+	$(swincludedir)/latin1utf8.h $(swincludedir)/listkey.h \
+	$(swincludedir)/localemgr.h $(swincludedir)/lzsscomprs.h \
+	$(swincludedir)/markupfiltmgr.h $(swincludedir)/multimapwdef.h \
+	$(swincludedir)/nullim.h $(swincludedir)/osisheadings.h \
+	$(swincludedir)/osishtmlhref.h $(swincludedir)/osiswebif.h \
+	$(swincludedir)/osismorph.h \
 	$(swincludedir)/osismorphsegmentation.h \
 	$(swincludedir)/osisplain.h $(swincludedir)/osisrtf.h \
 	$(swincludedir)/osisosis.h $(swincludedir)/osisstrongs.h \
@@ -557,37 +577,38 @@ pkginclude_HEADERS = $(swincludedir)/Greek2Greek.h \
 	$(swincludedir)/rawstr4.h $(swincludedir)/rawtext.h \
 	$(swincludedir)/rawverse.h $(swincludedir)/regex.h \
 	$(swincludedir)/roman.h $(swincludedir)/rtfhtml.h \
-	$(swincludedir)/sapphire.h $(swincludedir)/scsuutf8.h \
-	$(swincludedir)/strkey.h $(swincludedir)/swbasicfilter.h \
-	$(swincludedir)/swbuf.h $(swincludedir)/swcacher.h \
-	$(swincludedir)/swcipher.h $(swincludedir)/swcom.h \
-	$(swincludedir)/swcomprs.h $(swincludedir)/swconfig.h \
-	$(swincludedir)/swdisp.h $(swincludedir)/swfilter.h \
-	$(swincludedir)/swfiltermgr.h $(swincludedir)/swgenbook.h \
-	$(swincludedir)/swinputmeth.h $(swincludedir)/swkey.h \
-	$(swincludedir)/swld.h $(swincludedir)/swlocale.h \
-	$(swincludedir)/swlog.h $(swincludedir)/swmacs.h \
-	$(swincludedir)/swmgr.h $(swincludedir)/stringmgr.h \
-	$(swincludedir)/swmodule.h $(swincludedir)/swoptfilter.h \
-	$(swincludedir)/swobject.h $(swincludedir)/swsearchable.h \
-	$(swincludedir)/swtext.h $(swincludedir)/swunicod.h \
-	$(swincludedir)/swversion.h $(swincludedir)/sysdata.h \
-	$(swincludedir)/thmlfootnotes.h $(swincludedir)/thmlgbf.h \
-	$(swincludedir)/thmlheadings.h $(swincludedir)/thmlhtml.h \
-	$(swincludedir)/thmlhtmlhref.h $(swincludedir)/thmlwebif.h \
-	$(swincludedir)/thmllemma.h $(swincludedir)/thmlmorph.h \
-	$(swincludedir)/thmlosis.h $(swincludedir)/thmlplain.h \
-	$(swincludedir)/thmlrtf.h $(swincludedir)/thmlscripref.h \
-	$(swincludedir)/thmlstrongs.h $(swincludedir)/thmlvariants.h \
-	$(swincludedir)/thmlwordjs.h $(swincludedir)/teiplain.h \
-	$(swincludedir)/teirtf.h $(swincludedir)/treekey.h \
+	$(swincludedir)/sapphire.h $(swincludedir)/strkey.h \
+	$(swincludedir)/swbasicfilter.h $(swincludedir)/swbuf.h \
+	$(swincludedir)/swcacher.h $(swincludedir)/swcipher.h \
+	$(swincludedir)/swcom.h $(swincludedir)/swcomprs.h \
+	$(swincludedir)/swconfig.h $(swincludedir)/swdisp.h \
+	$(swincludedir)/swfilter.h $(swincludedir)/swfiltermgr.h \
+	$(swincludedir)/swgenbook.h $(swincludedir)/swinputmeth.h \
+	$(swincludedir)/swkey.h $(swincludedir)/swld.h \
+	$(swincludedir)/swlocale.h $(swincludedir)/swlog.h \
+	$(swincludedir)/swmacs.h $(swincludedir)/swmgr.h \
+	$(swincludedir)/stringmgr.h $(swincludedir)/swmodule.h \
+	$(swincludedir)/swoptfilter.h $(swincludedir)/swobject.h \
+	$(swincludedir)/swsearchable.h $(swincludedir)/swtext.h \
+	$(swincludedir)/swunicod.h $(swincludedir)/swversion.h \
+	$(swincludedir)/sysdata.h $(swincludedir)/thmlfootnotes.h \
+	$(swincludedir)/thmlgbf.h $(swincludedir)/thmlheadings.h \
+	$(swincludedir)/thmlhtml.h $(swincludedir)/thmlhtmlhref.h \
+	$(swincludedir)/thmlwebif.h $(swincludedir)/thmllemma.h \
+	$(swincludedir)/thmlmorph.h $(swincludedir)/thmlosis.h \
+	$(swincludedir)/thmlplain.h $(swincludedir)/thmlrtf.h \
+	$(swincludedir)/thmlscripref.h $(swincludedir)/thmlstrongs.h \
+	$(swincludedir)/thmlvariants.h $(swincludedir)/thmlwordjs.h \
+	$(swincludedir)/teiplain.h $(swincludedir)/teirtf.h \
+	$(swincludedir)/teihtmlhref.h $(swincludedir)/treekey.h \
 	$(swincludedir)/treekeyidx.h $(swincludedir)/unicodertf.h \
 	$(swincludedir)/url.h $(swincludedir)/untgz.h \
 	$(swincludedir)/utf16utf8.h $(swincludedir)/utf8arshaping.h \
 	$(swincludedir)/utf8bidireorder.h \
 	$(swincludedir)/utf8cantillation.h \
 	$(swincludedir)/utf8greekaccents.h \
-	$(swincludedir)/utf8hebrewpoints.h $(swincludedir)/utf8html.h \
+	$(swincludedir)/utf8hebrewpoints.h \
+	$(swincludedir)/utf8arabicpoints.h $(swincludedir)/utf8html.h \
 	$(swincludedir)/utf8latin1.h $(swincludedir)/utf8nfc.h \
 	$(swincludedir)/utf8nfkd.h \
 	$(swincludedir)/utf8transliterator.h \
@@ -605,8 +626,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/..
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -636,8 +657,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -645,8 +666,8 @@ uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -668,6 +689,7 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cipherfil.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curlftpt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curlhttpt.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/encfiltmgr.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/entriesblk.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filemgr.Plo@am__quote@
@@ -708,6 +730,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisplain.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisredletterwords.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisrtf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisruby.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisscripref.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisstrongs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisvariants.Plo@am__quote@
@@ -732,7 +755,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/roman.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtfhtml.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sapphire.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scsuutf8.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stringmgr.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strkey.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swbasicfilter.Plo@am__quote@
@@ -781,6 +803,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/untgz.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf16utf8.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8arabicpoints.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8arshaping.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8bidireorder.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8cantillation.Plo@am__quote@
@@ -795,6 +818,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utilstr.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utilxml.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/versekey.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/versemgr.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/versetreekey.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zcom.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zipcomprs.Plo@am__quote@
@@ -992,6 +1016,13 @@ curlftpt.lo: $(mgrdir)/curlftpt.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o curlftpt.lo `test -f '$(mgrdir)/curlftpt.cpp' || echo '$(srcdir)/'`$(mgrdir)/curlftpt.cpp
 
+curlhttpt.lo: $(mgrdir)/curlhttpt.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT curlhttpt.lo -MD -MP -MF $(DEPDIR)/curlhttpt.Tpo -c -o curlhttpt.lo `test -f '$(mgrdir)/curlhttpt.cpp' || echo '$(srcdir)/'`$(mgrdir)/curlhttpt.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/curlhttpt.Tpo $(DEPDIR)/curlhttpt.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(mgrdir)/curlhttpt.cpp' object='curlhttpt.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o curlhttpt.lo `test -f '$(mgrdir)/curlhttpt.cpp' || echo '$(srcdir)/'`$(mgrdir)/curlhttpt.cpp
+
 swconfig.lo: $(mgrdir)/swconfig.cpp
 @am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swconfig.lo -MD -MP -MF $(DEPDIR)/swconfig.Tpo -c -o swconfig.lo `test -f '$(mgrdir)/swconfig.cpp' || echo '$(srcdir)/'`$(mgrdir)/swconfig.cpp
 @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/swconfig.Tpo $(DEPDIR)/swconfig.Plo
@@ -1034,6 +1065,13 @@ filemgr.lo: $(mgrdir)/filemgr.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o filemgr.lo `test -f '$(mgrdir)/filemgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/filemgr.cpp
 
+versemgr.lo: $(mgrdir)/versemgr.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT versemgr.lo -MD -MP -MF $(DEPDIR)/versemgr.Tpo -c -o versemgr.lo `test -f '$(mgrdir)/versemgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/versemgr.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/versemgr.Tpo $(DEPDIR)/versemgr.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(mgrdir)/versemgr.cpp' object='versemgr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o versemgr.lo `test -f '$(mgrdir)/versemgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/versemgr.cpp
+
 ftptrans.lo: $(mgrdir)/ftptrans.cpp
 @am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftptrans.lo -MD -MP -MF $(DEPDIR)/ftptrans.Tpo -c -o ftptrans.lo `test -f '$(mgrdir)/ftptrans.cpp' || echo '$(srcdir)/'`$(mgrdir)/ftptrans.cpp
 @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/ftptrans.Tpo $(DEPDIR)/ftptrans.Plo
@@ -1230,13 +1268,6 @@ utf16utf8.lo: $(filtersdir)/utf16utf8.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf16utf8.lo `test -f '$(filtersdir)/utf16utf8.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf16utf8.cpp
 
-scsuutf8.lo: $(filtersdir)/scsuutf8.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT scsuutf8.lo -MD -MP -MF $(DEPDIR)/scsuutf8.Tpo -c -o scsuutf8.lo `test -f '$(filtersdir)/scsuutf8.cpp' || echo '$(srcdir)/'`$(filtersdir)/scsuutf8.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/scsuutf8.Tpo $(DEPDIR)/scsuutf8.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(filtersdir)/scsuutf8.cpp' object='scsuutf8.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o scsuutf8.lo `test -f '$(filtersdir)/scsuutf8.cpp' || echo '$(srcdir)/'`$(filtersdir)/scsuutf8.cpp
-
 utf8html.lo: $(filtersdir)/utf8html.cpp
 @am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8html.lo -MD -MP -MF $(DEPDIR)/utf8html.Tpo -c -o utf8html.lo `test -f '$(filtersdir)/utf8html.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8html.cpp
 @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/utf8html.Tpo $(DEPDIR)/utf8html.Plo
@@ -1265,6 +1296,13 @@ utf8hebrewpoints.lo: $(filtersdir)/utf8hebrewpoints.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8hebrewpoints.lo `test -f '$(filtersdir)/utf8hebrewpoints.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8hebrewpoints.cpp
 
+utf8arabicpoints.lo: $(filtersdir)/utf8arabicpoints.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8arabicpoints.lo -MD -MP -MF $(DEPDIR)/utf8arabicpoints.Tpo -c -o utf8arabicpoints.lo `test -f '$(filtersdir)/utf8arabicpoints.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8arabicpoints.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/utf8arabicpoints.Tpo $(DEPDIR)/utf8arabicpoints.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(filtersdir)/utf8arabicpoints.cpp' object='utf8arabicpoints.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8arabicpoints.lo `test -f '$(filtersdir)/utf8arabicpoints.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8arabicpoints.cpp
+
 utf8greekaccents.lo: $(filtersdir)/utf8greekaccents.cpp
 @am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8greekaccents.lo -MD -MP -MF $(DEPDIR)/utf8greekaccents.Tpo -c -o utf8greekaccents.lo `test -f '$(filtersdir)/utf8greekaccents.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8greekaccents.cpp
 @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/utf8greekaccents.Tpo $(DEPDIR)/utf8greekaccents.Plo
@@ -1412,6 +1450,13 @@ osismorphsegmentation.lo: $(filtersdir)/osismorphsegmentation.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osismorphsegmentation.lo `test -f '$(filtersdir)/osismorphsegmentation.cpp' || echo '$(srcdir)/'`$(filtersdir)/osismorphsegmentation.cpp
 
+osisruby.lo: $(filtersdir)/osisruby.cpp
+@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisruby.lo -MD -MP -MF $(DEPDIR)/osisruby.Tpo -c -o osisruby.lo `test -f '$(filtersdir)/osisruby.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisruby.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/osisruby.Tpo $(DEPDIR)/osisruby.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(filtersdir)/osisruby.cpp' object='osisruby.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisruby.lo `test -f '$(filtersdir)/osisruby.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisruby.cpp
+
 gbfhtml.lo: $(filtersdir)/gbfhtml.cpp
 @am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfhtml.lo -MD -MP -MF $(DEPDIR)/gbfhtml.Tpo -c -o gbfhtml.lo `test -f '$(filtersdir)/gbfhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfhtml.cpp
 @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gbfhtml.Tpo $(DEPDIR)/gbfhtml.Plo
@@ -1825,8 +1870,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -1838,8 +1883,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -1849,13 +1894,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique