X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2FMakefile.am;h=46c01684883a17921695e12e9efcea57bfefc42a;hp=7cff54ec10b0d283d98c58106a3fe12c28f8b7a1;hb=f5730a77d7a6b2190f0457a56d220937004df964;hpb=bc34bd42eb228125be6ff9143d9f98dbe11889a0

diff --git a/src/Makefile.am b/src/Makefile.am
index 7cff54e..46c0168 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,8 +26,7 @@ YAZCOMP_Z = $(YAZCOMP) -d $(srcdir)/z.tcl -i yaz -I$(top_srcdir)/include
 YAZCOMP_I = $(YAZCOMP) -d $(srcdir)/ill.tcl -i yaz -I$(top_srcdir)/include
 
 AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS) 
-libyaz_la_LIBADD = $(SSL_LIBS)
-libyaz_server_la_CFLAGS = $(PTHREAD_CFLAGS)
+libyaz_la_LIBADD = $(SSL_LIBS) $(TCPD_LIBS)
 libyaz_server_la_LIBADD = libyaz.la
 libyaz_icu_la_CPPFLAGS = $(AM_CPPFLAGS) $(ICU_CPPFLAGS)
 libyaz_icu_la_LIBADD = libyaz.la $(ICU_LIBS)
@@ -64,7 +63,7 @@ diagsru_update.c $(top_srcdir)/include/yaz/diagsru_update.h: csvtosru_update.tcl
 GEN_FILES = oid_std.c \
   marc8.c marc8r.c iso5426.c \
   diagbib1.c diagsrw.c diagsru_update.c \
-  z-accdes1.c z-accform1.c z-acckrb1.c z-core.c \
+  z-accdes1.c z-accform1.c z-acckrb1.c z-core.c z-facet-1.c \
   z-diag1.c z-espec1.c z-estask.c z-exp.c z-grs.c z-mterm2.c z-opac.c \
   z-uifr1.c z-rrf1.c z-rrf2.c z-sum.c z-sutrs.c z-oclcui.c\
   zes-expi.c zes-exps.c zes-order.c zes-pquery.c zes-psched.c \
@@ -103,12 +102,13 @@ libyaz_la_SOURCES=version.c options.c log.c \
   copy_types.c match_glob.c poll.c daemon.c \
   iconv_encode_marc8.c iconv_encode_iso_8859_1.c iconv_encode_wchar.c \
   iconv_decode_marc8.c iconv_decode_iso5426.c iconv_decode_danmarc.c sc.c \
-  json.c xml_include.c
+  json.c xml_include.c file_glob.c dirent.c mutex-p.h mutex.c condvar.c \
+  thread_id.c gettimeofday.c thread_create.c spipe.c
 
 libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 
 libyaz_server_la_SOURCES = statserv.c seshigh.c eventl.c \
-  requestq.c eventl.h session.h mutex.c
+  requestq.c eventl.h session.h 
 
 libyaz_server_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
 
@@ -185,6 +185,12 @@ $(top_srcdir)/include/yaz/z-oclcui.h: \
 $(srcdir)/z.tcl $(srcdir)/oclcui.asn $(YAZCOMP)
 	$(TCLSH) $(YAZCOMP_Z) $(srcdir)/oclcui.asn
 
+# UserInfoFormat-facet-1
+z-facet-1.c \
+$(top_srcdir)/include/yaz/z-facet-1.h: $(srcdir)/facet.asn $(YAZCOMP)
+	$(TCLSH) $(YAZCOMP_Z) $(srcdir)/facet.asn
+
+
 # ILL protocol
 ill-core.c \
 $(top_srcdir)/include/yaz/ill-core.h: \
@@ -203,3 +209,4 @@ $(top_srcdir)/include/yaz/item-req.h: \
 $(srcdir)/ill.tcl $(srcdir)/item-req.asn $(YAZCOMP)
 	$(TCLSH) $(YAZCOMP_I) $(srcdir)/item-req.asn
 
+