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

diff --git a/index/Makefile.am b/index/Makefile.am
index 5f7907f..688e112 100644
--- a/index/Makefile.am
+++ b/index/Makefile.am
@@ -1,4 +1,3 @@
-## $Id: Makefile.am,v 1.59 2006-11-21 14:32:38 adam Exp $
 
 aux_libs = \
  ../rset/libidzebra-rset.la \
@@ -18,34 +17,40 @@ zebralib = libidzebra-2.0.la
 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 =
 mod_alvis_la_LIBADD = $(zebralib) $(mod_alvis_la_LADD)
 
-mod_text_la_SOURCES = rectext.c
+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)
@@ -57,6 +62,7 @@ EXTRA_LTLIBRARIES = \
 	mod-grs-marc.la  \
 	mod-safari.la \
 	mod-alvis.la \
+	mod-dom.la \
 	mod-text.la
 
 EXTRA_libidzebra_2_0_la_SOURCES = \
@@ -65,6 +71,7 @@ EXTRA_libidzebra_2_0_la_SOURCES = \
  $(mod_grs_marc_la_SOURCES) \
  $(mod_safari_la_SOURCES) \
  $(mod_alvis_la_SOURCES) \
+ $(mod_dom_la_SOURCES) \
  $(mod_text_la_SOURCES)
 
 lib_LTLIBRARIES = $(zebralib)
@@ -75,7 +82,7 @@ libidzebra_2_0_la_LDFLAGS=-export-dynamic -version-info $(ZEBRALIBS_VERSION_INFO
 libidzebra_2_0_la_SOURCES = \
   recctrl.c \
   recgrs.c \
-  sgmlread.c \
+  mod_grs_sgml.c \
   attribute.c \
   compact.c \
   dir.c dirs.c \
@@ -85,10 +92,12 @@ libidzebra_2_0_la_SOURCES = \
   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 \
-  rpnscan.c rpnsearch.c sortidx.c symtab.c stream.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
+  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
 
@@ -98,7 +107,8 @@ zebrash_SOURCES = zebrash.c
 kdump_SOURCES = kdump.c
 
 AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) \
-  -DDEFAULT_PROFILE_PATH=\"$(pkgdatadir)/tab\" \
+  -DDEFAULT_PROFILE_PATH=\"$(tabdatadir)\" \
+  -DDEFAULT_MODULE_PATH=\"$(modlibdir)\" \
   $(TCL_INCLUDE)
 
 LDADD = $(zebralib) $(YAZLALIB)