X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2FMakefile.am;h=906e26bbb398f37a7c3112327043bcff6e200d45;hb=1e58ebd4607490d810c7396a4e87eb70d9528166;hp=0da7de0559e6ffdc6352b76020fc7180d8d15856;hpb=2e4e9c6def27f1e1463dcb6f205fab6a98054f38;p=idzebra-moved-to-github.git

diff --git a/index/Makefile.am b/index/Makefile.am
index 0da7de0..906e26b 100644
--- a/index/Makefile.am
+++ b/index/Makefile.am
@@ -1,41 +1,41 @@
-## $Id: Makefile.am,v 1.24 2004-08-04 08:35:23 adam Exp $
+## $Id: Makefile.am,v 1.29 2004-10-28 10:37:15 heikki Exp $
 
 noinst_PROGRAMS = apitest kdump
 
-noinst_LIBRARIES = libzebra.a
+lib_LTLIBRARIES = libidzebra-api.la
 
-libzebra_a_SOURCES = dir.c dirs.c trav.c kinput.c kcompare.c \
+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 \
+ rank1.c trunc.c retrieve.c extract.c \
  index.h recindex.h recindxp.h \
  zinfo.h zserver.h zvrank.c
 
-libzebra_a_LIBADD = \
- ../rset/librset.a ../dict/libdict.a  ../isams/libisams.a \
- ../isam/libisam.a ../isamc/libisamc.a ../isamb/libisamb.a \
- ../recctrl/librecctrl.a ../data1/libdata1.a ../bfile/libbfile.a \
- ../dfa/libdfa.a ../util/libutil.a
-
 bin_PROGRAMS = zebraidx zebrasrv zebrash
 
+zebralibs = \
+ ../index/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 \
+ ../data1/libidzebra-data1.la \
+ ../bfile/libidzebra-bfile.la \
+ ../dfa/libidzebra-dfa.la \
+ ../util/libidzebra-util.la
+
 zebraidx_SOURCES = main.c
 zebrasrv_SOURCES = zserver.c
 zebrash_SOURCES = zebrash.c
 apitest_SOURCES = apitest.c
 kdump_SOURCES = kdump.c
 
-AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) $(TCL_INCLUDE) -DDEFAULT_PROFILE_PATH=\"$(pkgdatadir)/tab\"
+AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC) \
+  -DDEFAULT_PROFILE_PATH=\"$(pkgdatadir)/tab\"
 
-zebrash_LDADD= libzebra.a $(YAZLIB) $(READLINE_LIBS) $(TCL_LIB)
+zebrash_LDADD= $(zebralibs) $(YAZLALIB) $(READLINE_LIBS)
 
-LDADD = libzebra.a $(YAZLIB) $(TCL_LIB)
+LDADD = $(zebralibs) $(YAZLALIB)
 
-libzebra.a: $(libzebra_a_OBJECTS) $(libzebra_a_DEPENDENCIES)
-	-mkdir atmp
-	-rm -f libzebra.a
-	-rm -f atmp/*.o
-	for i in $(libzebra_a_LIBADD); do cd atmp; rm -f __*; ar x ../$$i; cd ..; done
-	ar cru libzebra.a $(libzebra_a_OBJECTS) atmp/*.o
-	-rm -fr atmp
-	$(RANLIB) libzebra.a