Imported Upstream version 1.5.7

1 files changed, 39 insertions, 12 deletions

diff --git a/src/modules/filters/Makefile.am b/src/modules/filters/Makefile.am
index c58fb5f..c9a6bef 100644
--- a/src/modules/filters/Makefile.am
+++ b/src/modules/filters/Makefile.am
@@ -1,22 +1,24 @@
 filtersdir = $(top_srcdir)/src/modules/filters
 
 libsword_la_SOURCES += $(filtersdir)/swbasicfilter.cpp
+libsword_la_SOURCES += $(filtersdir)/swoptfilter.cpp
 
 libsword_la_SOURCES += $(filtersdir)/gbfhtml.cpp
 libsword_la_SOURCES += $(filtersdir)/gbfhtmlhref.cpp
+libsword_la_SOURCES += $(filtersdir)/gbfwebif.cpp
 libsword_la_SOURCES += $(filtersdir)/gbfplain.cpp
 libsword_la_SOURCES += $(filtersdir)/gbfrtf.cpp
 libsword_la_SOURCES += $(filtersdir)/plainhtml.cpp
-libsword_la_SOURCES += $(filtersdir)/rwphtml.cpp
-libsword_la_SOURCES += $(filtersdir)/rwprtf.cpp
 libsword_la_SOURCES += $(filtersdir)/cipherfil.cpp
 libsword_la_SOURCES += $(filtersdir)/rtfhtml.cpp
 
 libsword_la_SOURCES += $(filtersdir)/gbfstrongs.cpp
 libsword_la_SOURCES += $(filtersdir)/gbffootnotes.cpp
 libsword_la_SOURCES += $(filtersdir)/gbfheadings.cpp
+libsword_la_SOURCES += $(filtersdir)/gbfredletterwords.cpp
 libsword_la_SOURCES += $(filtersdir)/gbfmorph.cpp
 libsword_la_SOURCES += $(filtersdir)/plainfootnotes.cpp
+
 libsword_la_SOURCES += $(filtersdir)/thmlstrongs.cpp
 libsword_la_SOURCES += $(filtersdir)/thmlfootnotes.cpp
 libsword_la_SOURCES += $(filtersdir)/thmlheadings.cpp
@@ -30,8 +32,24 @@ libsword_la_SOURCES += $(filtersdir)/thmlgbf.cpp
 libsword_la_SOURCES += $(filtersdir)/thmlrtf.cpp
 libsword_la_SOURCES += $(filtersdir)/thmlhtml.cpp
 libsword_la_SOURCES += $(filtersdir)/thmlhtmlhref.cpp
+libsword_la_SOURCES += $(filtersdir)/thmlwebif.cpp
+
+libsword_la_SOURCES += $(filtersdir)/thmlosis.cpp
+libsword_la_SOURCES += $(filtersdir)/gbfosis.cpp
 libsword_la_SOURCES += $(filtersdir)/thmlplain.cpp
 
+libsword_la_SOURCES += $(filtersdir)/osisheadings.cpp
+libsword_la_SOURCES += $(filtersdir)/osisfootnotes.cpp 
+libsword_la_SOURCES += $(filtersdir)/osishtmlhref.cpp
+libsword_la_SOURCES += $(filtersdir)/osiswebif.cpp
+libsword_la_SOURCES += $(filtersdir)/osismorph.cpp
+libsword_la_SOURCES += $(filtersdir)/osisstrongs.cpp
+libsword_la_SOURCES += $(filtersdir)/osisplain.cpp
+libsword_la_SOURCES += $(filtersdir)/osisrtf.cpp
+libsword_la_SOURCES += $(filtersdir)/osislemma.cpp
+libsword_la_SOURCES += $(filtersdir)/osisredletterwords.cpp
+libsword_la_SOURCES += $(filtersdir)/osisscripref.cpp
+
 libsword_la_SOURCES += $(filtersdir)/unicodertf.cpp
 libsword_la_SOURCES += $(filtersdir)/latin1utf8.cpp
 libsword_la_SOURCES += $(filtersdir)/latin1utf16.cpp
@@ -41,25 +59,34 @@ libsword_la_SOURCES += $(filtersdir)/scsuutf8.cpp
 libsword_la_SOURCES += $(filtersdir)/utf8html.cpp
 libsword_la_SOURCES += $(filtersdir)/utf8latin1.cpp
 
-libsword_la_SOURCES += $(filtersdir)/thmlolb.cpp
+libsword_la_SOURCES += $(filtersdir)/utf8cantillation.cpp
+libsword_la_SOURCES += $(filtersdir)/utf8hebrewpoints.cpp
+libsword_la_SOURCES += $(filtersdir)/utf8greekaccents.cpp
 
 libsword_la_SOURCES += $(filtersdir)/greeklexattribs.cpp
 
-if ICU
-ICUDEFS = -D_ICU_
 SWICUSRC = $(filtersdir)/utf8transliterator.cpp
 SWICUSRC += $(filtersdir)/utf8nfc.cpp
 SWICUSRC += $(filtersdir)/utf8nfkd.cpp
 SWICUSRC += $(filtersdir)/utf8arshaping.cpp
 SWICUSRC += $(filtersdir)/utf8bidireorder.cpp
+
+if ICU
+ICUDEFS = -D_ICU_
+DISTSWICUSRC =
+SWREALICUSRC = $(SWICUSRC)
+else
+if ICUSWORD
+ICUDEFS = -D_ICU_ -D_ICUSWORD_
+DISTSWICUSRC =
+SWREALICUSRC = $(SWICUSRC)
 else
-SWICUSRC =
-ICUDEFS = 
+DISTSWICUSRC = $(SWICUSRC)
+SWREALICUSRC =
+endif
 endif
-libsword_la_SOURCES += $(SWICUSRC)
-DEFS += $(ICUDEFS)
 
-libsword_la_SOURCES += $(filtersdir)/utf8cantillation.cpp
-libsword_la_SOURCES += $(filtersdir)/utf8hebrewpoints.cpp
-libsword_la_SOURCES += $(filtersdir)/utf8greekaccents.cpp
+INCLUDES += $(ICUDEFS)
+libsword_la_SOURCES += $(SWREALICUSRC)
+EXTRA_DIST = $(DISTSWICUSRC)