Minor changes.

[yaz-moved-to-github.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index d44ac1d..527551b 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,8 +1,10 @@
-## $Id: Makefile.am,v 1.4 2000-04-06 12:32:56 adam Exp $
+## $Id: Makefile.am,v 1.11 2001-04-05 13:34:36 adam Exp $
 
-lib_LTLIBRARIES = libyaz.la
+if ISTHR
+extra=libyazthread.la
+endif
 
-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 ..
@@ -11,23 +13,22 @@ 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
+
+$(srcdir)/nmem.c: $(top_srcdir)/util/nmem.c
+       cp $(top_srcdir)/util/nmem.c $(srcdir)
+
+$(srcdir)/statserv.c: $(top_srcdir)/server/statserv.c
+       cp $(top_srcdir)/server/statserv.c $(srcdir)
+
+LDFLAGS=-version-info 1:0:0
+
+INCLUDES =-I$(top_srcdir)/include -I$(top_srcdir)/server  -D_REENTRANT=1 -DHAVE_PTHREAD_H=1
+
+bin_SCRIPTS = yaz-config
 
-libyaz_la_LIBADD=../odr/libodr.la ../@ASNMODULE@/libasn.la \
+libyaz_la_LIBADD=../odr/libodr.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
-
-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
+ ../retrieval/libret.la $(EXTRALIB)