X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2FMakefile.in;h=3500d9c0e3d06fbe455038678d5d8476c9553682;hb=2b33b395b50c562323ea2b0251f9b798cf5241d2;hp=17b76a52c4f35f01fc11ee545de5c705789d35d2;hpb=69da23537c6bb71ab948e079708bf8ea090de73f;p=idzebra-moved-to-github.git

diff --git a/index/Makefile.in b/index/Makefile.in
index 17b76a5..3500d9c 100644
--- a/index/Makefile.in
+++ b/index/Makefile.in
@@ -61,7 +61,6 @@ CC = @CC@
 CPP = @CPP@
 DEFS = @DEFS@
 MAKEINFO = @MAKEINFO@
-ODEFS = @ODEFS@
 PACKAGE = @PACKAGE@
 PROGPREFIX = @PROGPREFIX@
 RANLIB = @RANLIB@
@@ -70,9 +69,13 @@ TCL_INCLUDE = @TCL_INCLUDE@
 TCL_LIB = @TCL_LIB@
 VERSION = @VERSION@
 YAZINC = @YAZINC@
+YAZLALIB = @YAZLALIB@
 YAZLIB = @YAZLIB@
+YAZVERSION = @YAZVERSION@
 yazconfig = @yazconfig@
-@ISZMBOL_TRUE@bin_PROGRAMS = zmbolidx zmbolsrv apitest
+
+noinst_PROGRAMS = apitest
+@ISZMBOL_TRUE@bin_PROGRAMS = zmbolidx zmbolsrv 
 @ISZMBOL_FALSE@bin_PROGRAMS = zebraidx zebrasrv
 @ISZMBOL_TRUE@zmbolidx_SOURCES = main.c dir.c dirs.c trav.c extract.c kinput.c kcompare.c  symtab.c recindex.c recstat.c lockutil.c lockidx.c  zinfo.c invstat.c sortidx.c compact.c  index.h recindex.h recindxp.h zebraapi.h zinfo.h zserver.h
 
@@ -84,12 +87,12 @@ yazconfig = @yazconfig@
 apitest_SOURCES = apitest.c kcompare.c zrpn.c zsets.c attribute.c recindex.c  lockutil.c locksrv.c zinfo.c trunc.c sortidx.c rank1.c zebraapi.c  retrieve.c kinput.c  index.h recindex.h recindxp.h zebraapi.h zinfo.h zserver.h
 
 
-INCLUDES = -I$(srcdir)/../include @YAZINC@
+INCLUDES = -I$(srcdir)/../include $(YAZINC) $(TCL_INCLUDE)
 
-LDADD = @SUBLIBS@ @YAZLIB@
+LDADD = @SUBLIBS@ $(YAZLIB) $(TCL_LIB)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
-PROGRAMS =  $(bin_PROGRAMS)
+PROGRAMS =  $(bin_PROGRAMS) $(noinst_PROGRAMS)
 
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
@@ -107,12 +110,6 @@ zmbolidx_LDFLAGS =
 zmbolsrv_LDADD = $(LDADD)
 zmbolsrv_DEPENDENCIES = 
 zmbolsrv_LDFLAGS = 
-apitest_OBJECTS =  apitest.o kcompare.o zrpn.o zsets.o attribute.o \
-recindex.o lockutil.o locksrv.o zinfo.o trunc.o sortidx.o rank1.o \
-zebraapi.o retrieve.o kinput.o
-apitest_LDADD = $(LDADD)
-apitest_DEPENDENCIES = 
-apitest_LDFLAGS = 
 @ISZMBOL_FALSE@zebraidx_OBJECTS =  main.o dir.o dirs.o trav.o extract.o \
 @ISZMBOL_FALSE@kinput.o kcompare.o symtab.o recindex.o recstat.o \
 @ISZMBOL_FALSE@lockutil.o lockidx.o zinfo.o invstat.o sortidx.o \
@@ -126,6 +123,12 @@ zebraidx_LDFLAGS =
 zebrasrv_LDADD = $(LDADD)
 zebrasrv_DEPENDENCIES = 
 zebrasrv_LDFLAGS = 
+apitest_OBJECTS =  apitest.o kcompare.o zrpn.o zsets.o attribute.o \
+recindex.o lockutil.o locksrv.o zinfo.o trunc.o sortidx.o rank1.o \
+zebraapi.o retrieve.o kinput.o
+apitest_LDADD = $(LDADD)
+apitest_DEPENDENCIES = 
+apitest_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -144,8 +147,8 @@ DEP_FILES =  .deps/apitest.P .deps/attribute.P .deps/compact.P \
 .deps/recstat.P .deps/retrieve.P .deps/sortidx.P .deps/symtab.P \
 .deps/trav.P .deps/trunc.P .deps/zebraapi.P .deps/zinfo.P .deps/zrpn.P \
 .deps/zserver.P .deps/zsets.P
-SOURCES = $(zmbolidx_SOURCES) $(zmbolsrv_SOURCES) $(apitest_SOURCES) $(zebraidx_SOURCES) $(zebrasrv_SOURCES)
-OBJECTS = $(zmbolidx_OBJECTS) $(zmbolsrv_OBJECTS) $(apitest_OBJECTS) $(zebraidx_OBJECTS) $(zebrasrv_OBJECTS)
+SOURCES = $(zmbolidx_SOURCES) $(zmbolsrv_SOURCES) $(zebraidx_SOURCES) $(zebrasrv_SOURCES) $(apitest_SOURCES)
+OBJECTS = $(zmbolidx_OBJECTS) $(zmbolsrv_OBJECTS) $(zebraidx_OBJECTS) $(zebrasrv_OBJECTS) $(apitest_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -183,6 +186,15 @@ uninstall-binPROGRAMS:
 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	done
 
+mostlyclean-noinstPROGRAMS:
+
+clean-noinstPROGRAMS:
+	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+
+distclean-noinstPROGRAMS:
+
+maintainer-clean-noinstPROGRAMS:
+
 .s.o:
 	$(COMPILE) -c $<
 
@@ -207,10 +219,6 @@ zmbolsrv: $(zmbolsrv_OBJECTS) $(zmbolsrv_DEPENDENCIES)
 	@rm -f zmbolsrv
 	$(LINK) $(zmbolsrv_LDFLAGS) $(zmbolsrv_OBJECTS) $(zmbolsrv_LDADD) $(LIBS)
 
-apitest: $(apitest_OBJECTS) $(apitest_DEPENDENCIES)
-	@rm -f apitest
-	$(LINK) $(apitest_LDFLAGS) $(apitest_OBJECTS) $(apitest_LDADD) $(LIBS)
-
 zebraidx: $(zebraidx_OBJECTS) $(zebraidx_DEPENDENCIES)
 	@rm -f zebraidx
 	$(LINK) $(zebraidx_LDFLAGS) $(zebraidx_OBJECTS) $(zebraidx_LDADD) $(LIBS)
@@ -219,6 +227,10 @@ zebrasrv: $(zebrasrv_OBJECTS) $(zebrasrv_DEPENDENCIES)
 	@rm -f zebrasrv
 	$(LINK) $(zebrasrv_LDFLAGS) $(zebrasrv_OBJECTS) $(zebrasrv_LDADD) $(LIBS)
 
+apitest: $(apitest_OBJECTS) $(apitest_DEPENDENCIES)
+	@rm -f apitest
+	$(LINK) $(apitest_LDFLAGS) $(apitest_OBJECTS) $(apitest_LDADD) $(LIBS)
+
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP)
@@ -336,22 +348,25 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
-		mostlyclean-tags mostlyclean-depend mostlyclean-generic
+mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \
+		mostlyclean-compile mostlyclean-tags mostlyclean-depend \
+		mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-binPROGRAMS clean-compile clean-tags clean-depend \
-		clean-generic mostlyclean-am
+clean-am:  clean-binPROGRAMS clean-noinstPROGRAMS clean-compile \
+		clean-tags clean-depend clean-generic mostlyclean-am
 
 clean: clean-am
 
-distclean-am:  distclean-binPROGRAMS distclean-compile distclean-tags \
-		distclean-depend distclean-generic clean-am
+distclean-am:  distclean-binPROGRAMS distclean-noinstPROGRAMS \
+		distclean-compile distclean-tags distclean-depend \
+		distclean-generic clean-am
 
 distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-binPROGRAMS \
+		maintainer-clean-noinstPROGRAMS \
 		maintainer-clean-compile maintainer-clean-tags \
 		maintainer-clean-depend maintainer-clean-generic \
 		distclean-am
@@ -362,6 +377,8 @@ maintainer-clean: maintainer-clean-am
 
 .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
 maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
+mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
+clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile tags mostlyclean-tags distclean-tags \
 clean-tags maintainer-clean-tags distdir mostlyclean-depend \