X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2FMakefile;h=8a45db2ab3d995a6889a32219d5b28dac4c600d2;hb=85df66537199c30a492ad54be4fbe25fa77e18c8;hp=9abdee18662cb71bd71bfabd91f1ce3f946a872f;hpb=1891a7ab41007b52166ac5027389f0191193f997;p=idzebra-moved-to-github.git

diff --git a/index/Makefile b/index/Makefile
index 9abdee1..8a45db2 100644
--- a/index/Makefile
+++ b/index/Makefile
@@ -1,42 +1,46 @@
 # Copyright (C) 1995, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.19 1995-11-17 15:54:41 adam Exp $
+# $Id: Makefile,v 1.30 1995-12-11 09:12:44 adam Exp $
 
 SHELL=/bin/sh
 RANLIB=ranlib
-YAZ=../../yaz
-YAZLIB=$(YAZ)/lib/libyaz.a
-OSILIB=../../xtimosi/src/libmosi.a $(YAZ)/lib/librfc.a
+
+#YAZLIB=../../yaz/lib/libyaz.a
+YAZLIB=-lyaz
+#YAZINC=-I../../yaz/include
+#OSILIB=../../xtimosi/src/libmosi.a ../../yaz/lib/librfc.a
+OSILIB=../../xtimosi/src/libmosi.a -lrfc
 #NETLIB=-lnsl -lsocket
-INCLUDE=-I../include -I$(YAZ)/include
-TPROG1=index
+
+INCLUDE=-I../include $(YAZINC)
+TPROG1=zebraidx
 TPROG2=kdump
-TPROG3=zserver
+TPROG3=zebrasrv
 DEFS=$(INCLUDE)
 O1 = main.o dir.o dirs.o trav.o extract.o kinput.o kcompare.o \
- symtab.o text.o recctrl.o structrec.o recindex.o
+ symtab.o text.o recctrl.o structrec.o recindex.o regxread.o recstat.o \
+ lockutil.o lockidx.o
 O2 = kdump.o
 O3 = zserver.o kcompare.o zrpn.o zsets.o text.o recctrl.o structrec.o  \
-	attribute.o recindex.o zlogs.o
+	attribute.o recindex.o zlogs.o regxread.o lockutil.o locksrv.o
 CPP=$(CC) -E
 
 all: $(TPROG1) $(TPROG2) $(TPROG3)
 
-$(TPROG1): $(O1) ../lib/dict.a \
-		../lib/isam.a ../lib/bfile.a ../lib/alexutil.a \
+$(TPROG1): $(O1) ../lib/dict.a ../lib/isam.a \
+		../lib/bfile.a ../lib/dfa.a ../lib/alexutil.a 
+	$(CC) $(CFLAGS) -o $(TPROG1) $(O1) \
+		../lib/dict.a ../lib/isam.a \
+		../lib/bfile.a ../lib/dfa.a ../lib/alexutil.a \
 		$(YAZLIB)
-	$(CC) $(CFLAGS) -o $(TPROG1) $(O1) ../lib/dict.a \
-		../lib/isam.a ../lib/bfile.a ../lib/alexutil.a \
-		$(YAZLIB) $(OSILIB)
 
-$(TPROG2): $(O2) $(YAZLIB)
+$(TPROG2): $(O2)
 	$(CC) $(CFLAGS) -o $(TPROG2) $(O2) $(YAZLIB)
 
 $(TPROG3): $(O3) \
 		../lib/rset.a ../lib/dict.a ../lib/isam.a ../lib/bfile.a \
-		../lib/dfa.a ../lib/alexutil.a \
-		$(YAZLIB)
+		../lib/dfa.a ../lib/alexutil.a
 	$(CC) $(CFLAGS) -o $(TPROG3) $(O3) \
 		../lib/rset.a ../lib/dict.a ../lib/isam.a ../lib/bfile.a \
 		../lib/dfa.a ../lib/alexutil.a \