X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FMakefile.in;h=40d7e64cb68b4c93b90140f67b1592cc758b9406;hb=43801085d371c69455730182f72c4e53d8c8218f;hp=8c853941574e483058422abb80f8bb56903f2601;hpb=70f0ff9bf920e65b47211fd88f409e2b1a2b8e43;p=yaz-moved-to-github.git

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 8c85394..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@
@@ -77,12 +78,11 @@ 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
-
-EXTRA_DIST = yaz-config.in
+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 ..
@@ -91,7 +91,13 @@ EXTRA_libyaz_la_SOURCES = x.c
 # No real sources
 libyaz_la_SOURCES = 
 
-LDFLAGS = -version-info 0:0:0
+libyazthread_la_SOURCES = nmem.c statserv.c
+
+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)
 
@@ -108,6 +114,9 @@ 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@
@@ -122,9 +131,9 @@ 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:
@@ -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,6 +390,12 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
+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.
 .NOEXPORT: