X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FMakefile.in;h=40d7e64cb68b4c93b90140f67b1592cc758b9406;hb=e437c49e5b848a38b8dd0913da4c79828c60af18;hp=c0dde72e26a821975a576053ca841d77f4fba988;hpb=7acd51b7cdffca5ad92a777d2c6e8e9bae1f9fd3;p=yaz-moved-to-github.git

diff --git a/lib/Makefile.in b/lib/Makefile.in
index c0dde72..40d7e64 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -67,6 +67,7 @@ DLLTOOL = @DLLTOOL@
 ILLLIB = @ILLLIB@
 ILLMODULE = @ILLMODULE@
 LD = @LD@
+LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
@@ -74,42 +75,48 @@ NM = @NM@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
+READLINE_LIBS = @READLINE_LIBS@
 SUBDIRS_VAR = @SUBDIRS_VAR@
 VERSION = @VERSION@
+YAZ_SRC_ROOT = @YAZ_SRC_ROOT@
 
-lib_LTLIBRARIES = libyaz.la
+@ISTHR_TRUE@extra = libyazthread.la
 
-bin_SCRIPTS = yaz-config
+lib_LTLIBRARIES = libyaz.la $(extra)
 
 # If the line below is omitted the LINK variable is
 # not set in Makefile.in and it will NOT work ..
 EXTRA_libyaz_la_SOURCES = x.c
 
-LIBS = 
-
 # No real sources
 libyaz_la_SOURCES = 
 
-LDFLAGS = -version-info 0:0:0
+libyazthread_la_SOURCES = nmem.c statserv.c
 
-libyaz_la_LIBADD = ../odr/libodr.la ../@ASNMODULE@/libasn.la  ../comstack/libcomstack.la ../server/libserver.la  ../zutil/libzutil.la ../util/libutil.la ../ccl/libccl.la  ../retrieval/libret.la @ILLLIB@
+LDFLAGS = -version-info 1:0:0
 
+INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../server  -D_REENTRANT=1 -DHAVE_PTHREAD_H=1
+
+bin_SCRIPTS = yaz-config
+
+libyaz_la_LIBADD = ../odr/libodr.la ../$(ASNMODULE)/libasn.la  ../comstack/libcomstack.la ../server/libserver.la  ../zutil/libzutil.la ../util/libutil.la ../ccl/libccl.la  ../retrieval/libret.la $(ILLLIB)
 
-#  Public libraries and header files
-LIBDIR = $(exec_prefix)/lib
-INCDIR = $(prefix)/include
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES = 
+CONFIG_CLEAN_FILES =  yaz-config
 LTLIBRARIES =  $(lib_LTLIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
+LIBS = @LIBS@
 libyaz_la_LDFLAGS = 
-libyaz_la_DEPENDENCIES =  ../odr/libodr.la ../@ASNMODULE@/libasn.la \
+libyaz_la_DEPENDENCIES =  ../odr/libodr.la ../$(ASNMODULE)/libasn.la \
 ../comstack/libcomstack.la ../server/libserver.la ../zutil/libzutil.la \
 ../util/libutil.la ../ccl/libccl.la ../retrieval/libret.la
 libyaz_la_OBJECTS = 
+libyazthread_la_LDFLAGS = 
+libyazthread_la_LIBADD = 
+libyazthread_la_OBJECTS =  nmem.lo statserv.lo
 SCRIPTS =  $(bin_SCRIPTS)
 
 CFLAGS = @CFLAGS@
@@ -117,16 +124,16 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CF
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in
+DIST_COMMON =  Makefile.am Makefile.in yaz-config.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = gtar
 GZIP_ENV = --best
-DEP_FILES =  .deps/x.P
-SOURCES = $(libyaz_la_SOURCES) $(EXTRA_libyaz_la_SOURCES)
-OBJECTS = $(libyaz_la_OBJECTS)
+DEP_FILES =  .deps/nmem.P .deps/statserv.P .deps/x.P
+SOURCES = $(libyaz_la_SOURCES) $(EXTRA_libyaz_la_SOURCES) $(libyazthread_la_SOURCES)
+OBJECTS = $(libyaz_la_OBJECTS) $(libyazthread_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -138,6 +145,8 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
+yaz-config: $(top_builddir)/config.status yaz-config.in
+	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 mostlyclean-libLTLIBRARIES:
 
@@ -199,6 +208,9 @@ maintainer-clean-libtool:
 libyaz.la: $(libyaz_la_OBJECTS) $(libyaz_la_DEPENDENCIES)
 	$(LINK) -rpath $(libdir) $(libyaz_la_LDFLAGS) $(libyaz_la_OBJECTS) $(libyaz_la_LIBADD) $(LIBS)
 
+libyazthread.la: $(libyazthread_la_OBJECTS) $(libyazthread_la_DEPENDENCIES)
+	$(LINK) -rpath $(libdir) $(libyazthread_la_LDFLAGS) $(libyazthread_la_OBJECTS) $(libyazthread_la_LIBADD) $(LIBS)
+
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -378,14 +390,11 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
-yaz-config: Makefile
-	@echo "#!/bin/sh" >yaz-config
-	@echo "# YAZ settings for developers" >>yaz-config
-	@echo "YAZBIN='$(bindir)'" >>yaz-config
-	@echo "YAZTAB='$(pkgdatadir)/tab'" >>yaz-config
-	@echo "YAZLIB='-L$(libdir) -lyaz $(LIBS)'" >>yaz-config
-	@echo "YAZINC='-I$(includedir)'" >>yaz-config
-	chmod +x yaz-config
+nmem.c:
+	ln -s $(srcdir)/../util/nmem.c
+
+statserv.c:
+	ln -s $(srcdir)/../server/statserv.c
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.