[sword-svn] r1943 - in trunk: include src/mgr src/modules/filters

[scribe at crosswire.org]

Author: scribe
Date: 2006-07-07 11:02:01 -0700 (Fri, 07 Jul 2006)
New Revision: 1943

Modified:
   trunk/include/Makefile.am
   trunk/src/mgr/markupfiltmgr.cpp
   trunk/src/modules/filters/Makefile.am
Log:
Made new TEI stuff compile for linux


Modified: trunk/include/Makefile.am
===================================================================
--- trunk/include/Makefile.am	2006-07-06 04:34:59 UTC (rev 1942)
+++ trunk/include/Makefile.am	2006-07-07 18:02:01 UTC (rev 1943)
@@ -122,6 +122,9 @@
 pkginclude_HEADERS += $(swincludedir)/thmlvariants.h
 pkginclude_HEADERS += $(swincludedir)/thmlwordjs.h
 
+pkginclude_HEADERS += $(swincludedir)/teiplain.h
+pkginclude_HEADERS += $(swincludedir)/teirtf.h
+
 pkginclude_HEADERS += $(swincludedir)/treekey.h
 pkginclude_HEADERS += $(swincludedir)/treekeyidx.h
 pkginclude_HEADERS += $(swincludedir)/unicodertf.h

Modified: trunk/src/mgr/markupfiltmgr.cpp
===================================================================
--- trunk/src/mgr/markupfiltmgr.cpp	2006-07-06 04:34:59 UTC (rev 1942)
+++ trunk/src/mgr/markupfiltmgr.cpp	2006-07-07 18:02:01 UTC (rev 1943)
@@ -229,7 +229,7 @@
                         fromthml = new ThMLPlain();
                         fromgbf = new GBFPlain();
                         fromosis = new OSISPlain();
-                        fromtei = TEIPlain();
+                        fromtei = new TEIPlain();
                         break;
                 case FMT_THML:
                         fromplain = NULL;

Modified: trunk/src/modules/filters/Makefile.am
===================================================================
--- trunk/src/modules/filters/Makefile.am	2006-07-06 04:34:59 UTC (rev 1942)
+++ trunk/src/modules/filters/Makefile.am	2006-07-07 18:02:01 UTC (rev 1943)
@@ -29,6 +29,9 @@
 THMLFIL += $(filtersdir)/thmlwebif.cpp
 THMLFIL += $(filtersdir)/thmlwordjs.cpp
 
+TEIFIL = $(filtersdir)/teiplain.cpp
+TEIFIL += $(filtersdir)/teirtf.cpp
+
 CONVFIL = $(filtersdir)/gbfthml.cpp
 CONVFIL += $(filtersdir)/gbfosis.cpp
 CONVFIL += $(filtersdir)/thmlosis.cpp
@@ -98,4 +101,4 @@
 EXTRA_DIST = $(DISTSWICUSRC)
 
 libsword_la_SOURCES += $(OSISFIL) $(GBFFIL) \
-	$(THMLFIL) $(CONVFIL) $(PLFIL)
+	$(THMLFIL) $(CONVFIL) $(PLFIL) $(TEIFIL)