X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2FMakefile.am;h=688e11283a756b9dc4e706612bc65372a67f5682;hp=797253003090fbac411a29ac62c4f4208725bdd3;hb=b3679b1ecd730266f70a62347f66e5964a2fa030;hpb=7415d28c149c1bab51fe93aeaccdd14085b69bd9

diff --git a/index/Makefile.am b/index/Makefile.am
index 7972530..688e112 100644
--- a/index/Makefile.am
+++ b/index/Makefile.am
@@ -1,4 +1,3 @@
-## $Id: Makefile.am,v 1.48 2006-07-03 14:27:09 adam Exp $
 
 aux_libs = \
  ../rset/libidzebra-rset.la \
@@ -15,86 +14,102 @@ aux_libs = \
 # Should also match the libidzebra_..._la lines..!
 zebralib = libidzebra-2.0.la
 
-noinst_PROGRAMS = apitest kdump zebrash
+noinst_PROGRAMS = kdump zebrash
 
 modlibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)/modules
+tabdatadir = $(datadir)/$(PACKAGE)$(PACKAGE_SUFFIX)/tab
 
 # The shared modules 
-mod_grs_regx_la_SOURCES = regxread.c
+mod_grs_regx_la_SOURCES = mod_grs_regx.c
 mod_grs_regx_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
 mod_grs_regx_la_LADD = $(TCL_LIB)
 mod_grs_regx_la_LIBADD = $(zebralib) $(mod_grs_regx_la_LADD)
 
-mod_grs_xml_la_SOURCES = xmlread.c
+mod_grs_xml_la_SOURCES = mod_grs_xml.c
 mod_grs_xml_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
 mod_grs_xml_la_LADD = $(EXPAT_LIBS)
 mod_grs_xml_la_LIBADD = $(zebralib) $(mod_grs_xml_la_LADD)
 
-mod_grs_marc_la_SOURCES = marcread.c marcomp.c marcomp.h inline.c inline.h
+mod_grs_marc_la_SOURCES = mod_grs_marc.c marcomp.c marcomp.h inline.c inline.h
 mod_grs_marc_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
 mod_grs_marc_la_LADD =
 mod_grs_marc_la_LIBADD = $(zebralib) $(mod_grs_marc_la_LADD)
 
-mod_safari_la_SOURCES = safari.c
+mod_safari_la_SOURCES = mod_safari.c
 mod_safari_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
 mod_safari_la_LADD =
 mod_safari_la_LIBADD = $(zebralib) $(mod_safari_la_LADD)
 
-mod_alvis_la_SOURCES = alvis.c
+mod_alvis_la_SOURCES = mod_alvis.c
 mod_alvis_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
-mod_alvis_la_LADD = $(XSLT_LIBS)
+mod_alvis_la_LADD =
 mod_alvis_la_LIBADD = $(zebralib) $(mod_alvis_la_LADD)
 
+mod_dom_la_SOURCES = mod_dom.c
+mod_dom_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
+mod_dom_la_LADD =
+mod_dom_la_LIBADD = $(zebralib) $(mod_dom_la_LADD)
+
+mod_text_la_SOURCES = mod_text.c
+mod_text_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
+mod_text_la_LADD =
+mod_text_la_LIBADD = $(zebralib) $(mod_text_la_LADD)
+
 modlib_LTLIBRARIES = $(SHARED_MODULE_LA) 
 EXTRA_LTLIBRARIES = \
 	mod-grs-regx.la \
 	mod-grs-xml.la \
 	mod-grs-marc.la  \
 	mod-safari.la \
-	mod-alvis.la
+	mod-alvis.la \
+	mod-dom.la \
+	mod-text.la
 
 EXTRA_libidzebra_2_0_la_SOURCES = \
  $(mod_grs_regx_la_SOURCES) \
  $(mod_grs_xml_la_SOURCES) \
  $(mod_grs_marc_la_SOURCES) \
  $(mod_safari_la_SOURCES) \
- $(mod_alvis_la_SOURCES)
+ $(mod_alvis_la_SOURCES) \
+ $(mod_dom_la_SOURCES) \
+ $(mod_text_la_SOURCES)
 
 lib_LTLIBRARIES = $(zebralib)
 
-libidzebra_2_0_la_DEPENDENCIES = $(STATIC_MODULE_OBJ)
+libidzebra_2_0_la_DEPENDENCIES = $(STATIC_MODULE_OBJ) $(aux_libs)
 libidzebra_2_0_la_LIBADD = $(STATIC_MODULE_OBJ)  $(aux_libs) $(STATIC_MODULE_LADD)
-libidzebra_2_0_la_LDFLAGS=-export-dynamic -version-info $(ZEBRALIBS_VERSION)
+libidzebra_2_0_la_LDFLAGS=-export-dynamic -version-info $(ZEBRALIBS_VERSION_INFO)
 libidzebra_2_0_la_SOURCES = \
   recctrl.c \
   recgrs.c \
-  sgmlread.c \
-  rectext.c \
-  api_swig.c attribute.c \
+  mod_grs_sgml.c \
+  attribute.c \
   compact.c \
   dir.c dirs.c \
   extract.c \
   index.h invstat.c \
-  kinput.c kcompare.c  kcontrol.c \
+  kinput.c kcontrol.c \
   limit.c \
   orddict.c orddict.h \
   rank.h rank1.c ranksimilarity.c rankstatic.c \
-  recindex.c  recindex.h recindxp.h reckeys.c reckeys.h recstat.c retrieve.c \
-  sortidx.c symtab.c \
-  update_path.c update_file.c trunc.c \
-  zebraapi.c zinfo.c zinfo.h zserver.h zsets.c zrpn.c
+  records.c recindex.c recindex.h reckeys.c reckeys.h \
+  retrieve.c \
+  rpnscan.c rpnsearch.c sortidx.c stream.c \
+  update_path.c update_file.c trunc.c untrans.c isam_methods.c \
+  zaptterm.c zebraapi.c zinfo.c zinfo.h zsets.c key_block.c key_block.h \
+  check_res.c rset_isam.c
 
 bin_PROGRAMS = zebraidx zebrasrv
 
-zebraidx_SOURCES = main.c
-zebrasrv_SOURCES = zserver.c
+zebraidx_SOURCES = zebraidx.c
+zebrasrv_SOURCES = zebrasrv.c
 zebrash_SOURCES = zebrash.c
-apitest_SOURCES = apitest.c
 kdump_SOURCES = kdump.c
 
 AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) \
-  -DDEFAULT_PROFILE_PATH=\"$(pkgdatadir)/tab\" \
-  $(TCL_INCLUDE) $(XSLT_FLAGS) $(XSLT_CFLAGS)
+  -DDEFAULT_PROFILE_PATH=\"$(tabdatadir)\" \
+  -DDEFAULT_MODULE_PATH=\"$(modlibdir)\" \
+  $(TCL_INCLUDE)
 
 LDADD = $(zebralib) $(YAZLALIB)