Added defines YAZ_GNU_THREADS, YAZ_POSIX_THREADS in code and yaz-config

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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 197f1f8..a6a4f57 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,33 +1,37 @@
+## $Id: Makefile.am,v 1.14 2001-10-05 13:55:17 adam Exp $

 
 

-lib_LIBRARIES = libyaz.a
+if ISTHR
+extra=libyazthread.la
+endif
+
+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
+
+# No real sources
+libyaz_la_SOURCES=
+
+libyazthread_la_SOURCES=nmem.c statserv.c eventl.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)
+
+$(srcdir)/eventl.c: $(top_srcdir)/server/eventl.c
+       cp $(top_srcdir)/server/eventl.c $(srcdir)
+
+LDFLAGS=-version-info 1:0:0
+
+INCLUDES =-I$(top_srcdir)/include -I$(top_srcdir)/server  @CFLAGSTHREADS@

 
 bin_SCRIPTS = yaz-config
 
 
 bin_SCRIPTS = yaz-config
 

-libyaz_a_SOURCES=
-
-LIB=libyaz.a
-
-YAZLIBS=../odr/libodr.a ../@ASNMODULE@/libasn.a ../comstack/libcomstack.a \
- ../server/libserver.a ../zutil/libzutil.a ../util/libutil.a \
- ../ccl/libccl.a ../retrieval/libret.a @ILLLIB@
-
-libyaz.a: $(YAZLIBS)
-       rm -f $(LIB)
-       for i in $(YAZLIBS); do echo $$i; ar x $$i; rm -f __*; done
-       ar qc $(LIB) *.o
-       rm -f *.o
-       $(RANLIB) $(LIB)
-
-#  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
+libyaz_la_LIBADD=../odr/libodr.la \
+ ../comstack/libcomstack.la ../server/libserver.la \
+ ../zutil/libzutil.la ../util/libutil.la ../retrieval/libret.la \
+ $(EXTRALIB)