X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2FMakefile.am;h=c5d754018e3f1c515e7ff22c769888714f9cd3d5;hb=746f36f2b12f2a342dc0213cb03458359a493c8f;hp=2d5d3dd96f06b9f9dce231376183377b7c6336b0;hpb=cb007c6145b0dbb3fcbe9826f081650becf9a05c;p=idzebra-moved-to-github.git

diff --git a/index/Makefile.am b/index/Makefile.am
index 2d5d3dd..c5d7540 100644
--- a/index/Makefile.am
+++ b/index/Makefile.am
@@ -1,30 +1,41 @@
-## $Id: Makefile.am,v 1.26 2004-08-24 10:37:18 adam Exp $
-
-noinst_PROGRAMS = apitest kdump
-
-lib_LTLIBRARIES = libidzebra-api.la
-
-libidzebra_api_la_SOURCES = dir.c dirs.c trav.c kinput.c kcompare.c \
- attribute.c symtab.c recindex.c recstat.c lockutil.c  \
- zebraapi.c zinfo.c invstat.c sortidx.c compact.c zsets.c zrpn.c \
- rank1.c trunc.c retrieve.c extract.c livcode.c \
- index.h recindex.h recindxp.h \
- zinfo.h zserver.h zvrank.c
+## $Id: Makefile.am,v 1.38 2006-05-03 09:31:25 marc Exp $
+
+noinst_PROGRAMS = apitest kdump zebrasrv2 zebraidx2
+
+lib_LTLIBRARIES = libidzebra-api.la libidzebra-all.la
+
+libidzebra_all_la_SOURCES = 
+libidzebra_api_la_SOURCES = \
+  api_swig.c attribute.c \
+  compact.c \
+  dir.c dirs.c \
+  extract.c \
+  index.h invstat.c \
+  kinput.c kcompare.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 \
+  trav.c trunc.c \
+  zebraapi.c zinfo.c zinfo.h zserver.h zsets.c zrpn.c \
+  zvrank.c
 
 bin_PROGRAMS = zebraidx zebrasrv zebrash
 
 zebralibs = \
+ libidzebra-api.la \
  ../rset/libidzebra-rset.la \
+ ../recctrl/libidzebra-recctrl.la \
  ../dict/libidzebra-dict.la  \
  ../isams/libidzebra-isams.la \
  ../isamc/libidzebra-isamc.la \
  ../isamb/libidzebra-isamb.la \
- ../recctrl/libidzebra-recctrl.la \
  ../data1/libidzebra-data1.la \
  ../bfile/libidzebra-bfile.la \
  ../dfa/libidzebra-dfa.la \
- ../util/libidzebra-util.la \
- ../index/libidzebra-api.la
+ ../util/libidzebra-util.la
+
 
 zebraidx_SOURCES = main.c
 zebrasrv_SOURCES = zserver.c
@@ -32,10 +43,19 @@ zebrash_SOURCES = zebrash.c
 apitest_SOURCES = apitest.c
 kdump_SOURCES = kdump.c
 
-AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) $(TCL_INCLUDE) \
+AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) \
   -DDEFAULT_PROFILE_PATH=\"$(pkgdatadir)/tab\"
 
-zebrash_LDADD= $(zebralibs) $(YAZLALIB) $(READLINE_LIBS) $(TCL_LIB)
+zebrash_LDADD= $(zebralibs) $(YAZLALIB) $(READLINE_LIBS)
+
+LDADD = $(zebralibs) $(YAZLALIB)
+
+## Try make zebraidx zebrasrv versions with a combined lib
+libidzebra_all_la_LIBADD = $(zebralibs) $(YAZLALIB)
+
+zebraidx2_SOURCES = main.c
+zebraidx2_LDADD= libidzebra-all.la $(YAZLALIB) 
 
-LDADD = $(zebralibs) $(YAZLALIB) $(TCL_LIB)
+zebrasrv2_SOURCES = zserver.c
+zebrasrv2_LDADD= libidzebra-all.la $(YAZLALIB)