Zebra with full functionality

[idzebra-moved-to-github.git] / index / Makefile.am

diff --git a/index/Makefile.am b/index/Makefile.am
index 0a835a2..559f341 100644 (file)
--- a/index/Makefile.am
+++ b/index/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.9 2002-03-21 13:31:37 adam Exp $
+## $Id: Makefile.am,v 1.11 2002-04-05 08:46:26 adam Exp $
 
 noinst_PROGRAMS = apitest kdump
 
@@ -9,15 +9,11 @@ libzebra_a_SOURCES = dir.c dirs.c trav.c kinput.c kcompare.c \
  zebraapi.c zinfo.c invstat.c sortidx.c compact.c zsets.c zrpn.c \
  rank1.c trunc.c retrieve.c extract.c index.h recindex.h recindxp.h \
  zebraapi.h zinfo.h zserver.h
-if ISZMBOL
-zmbol_libs = ../isam/libisam.a ../isamc/libisamc.a ../isamb/libisamb.a
-else
-zmbol_libs =
-endif
 
 libzebra_a_LIBADD = \
  ../rset/librset.a ../dict/libdict.a  ../isams/libisams.a \
- $(zmbol_libs) ../recctrl/librecctrl.a ../bfile/libbfile.a ../dfa/libdfa.a \
+ ../isam/libisam.a ../isamc/libisamc.a ../isamb/libisamb.a \
+ ../recctrl/librecctrl.a ../bfile/libbfile.a ../dfa/libdfa.a \
  ../util/libutil.a
 
 if ISZMBOL
@@ -38,8 +34,9 @@ CFLAGS = -I$(srcdir)/../include $(YAZINC) $(TCL_INCLUDE)
 LDADD = libzebra.a $(YAZLIB) $(TCL_LIB)
 
 libzebra.a: $(libzebra_a_OBJECTS) $(libzebra_a_DEPENDENCIES)
-       -test ! -d atmp && mkdir atmp
+       -mkdir atmp
        -rm -f libzebra.a
-       mkdir atmp; for i in $(libzebra_a_LIBADD); do cd atmp; ar x ../$$i; cd ..; done
-       ar cru libzebra.a $(libzebra_a_OBJECTS) libzebra.a atmp/*.o
+       -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
        $(RANLIB) libzebra.a