X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2FMakefile.am;h=e72c1eea40cd874fec8c01d2cd3e1bbc8e055106;hb=4ce7bffcae2b1faaa0fb5d74eca9aeeb7f6d0c6e;hp=3bfc92d33875db4569823e968d4d8862b3c26792;hpb=d940392c53c32ccf76fb287cc5b997b9e921a431;p=yaz-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 3bfc92d..e72c1ee 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,29 +16,38 @@ illdatadir=$(pkgdatadir)/ill
 illdata_DATA=ill9702.asn item-req.asn ill.tcl oclc-ill-req-ext.asn
 
 EXTRA_DIST=$(tabdata_DATA) $(illdata_DATA) \
- charconv.tcl codetables.xml \
+ charconv.tcl codetables.xml codetables-iso5426.xml \
  csvtodiag.tcl csvtobib1.tcl csvtosrw.tcl bib1.csv srw.csv \
- csvtosru_update.tcl sru_update.csv \
- oidtoc.tcl oid.csv
+ csvtosru_update.tcl sru_update.csv mk_version.tcl \
+ oidtoc.tcl oid.csv sc_test.c
 
 YAZCOMP=$(top_srcdir)/util/yaz-asncomp
 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_server_la_LIBADD = libyaz.la
 libyaz_icu_la_CPPFLAGS = $(AM_CPPFLAGS) $(ICU_CPPFLAGS)
-libyaz_icu_la_LIBADD = $(ICU_LIBS)
+libyaz_icu_la_LIBADD = libyaz.la $(ICU_LIBS)
 
 AM_YFLAGS=-p cql_
 
 # MARC8->UTF8 conversion is generated from codetables.xml
 marc8.c: charconv.tcl codetables.xml
-	$(TCLSH) $(srcdir)/charconv.tcl -p marc8 $(srcdir)/codetables.xml -o marc8.c
+	$(TCLSH) $(srcdir)/charconv.tcl -p marc8 $(srcdir)/codetables.xml -o $@.tmp
+	mv -f $@.tmp $@
 
 # UTF-8->MARC8 conversion is generated from codetables.xml
 marc8r.c: charconv.tcl codetables.xml
-	$(TCLSH) $(srcdir)/charconv.tcl -r -p marc8r $(srcdir)/codetables.xml -o marc8r.c
+	$(TCLSH) $(srcdir)/charconv.tcl -r -p marc8r $(srcdir)/codetables.xml -o $@.tmp
+	mv -f $@.tmp $@
+
+# ISO5426->UTF8 conversion is generated from codetables-iso5426.xml
+iso5426.c: charconv.tcl codetables-iso5426.xml
+	$(TCLSH) $(srcdir)/charconv.tcl -p iso5426 $(srcdir)/codetables-iso5426.xml -o $@.tmp
+	mv -f $@.tmp $@
 
 # Generate OID database from CSV
 oid_std.c $(top_srcdir)/include/yaz/oid_std.h: oidtoc.tcl oid.csv
@@ -56,7 +65,7 @@ diagsru_update.c $(top_srcdir)/include/yaz/diagsru_update.h: csvtosru_update.tcl
 
 # Auto-generated C-files
 GEN_FILES = oid_std.c \
-  marc8.c marc8r.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-diag1.c z-espec1.c z-estask.c z-exp.c z-grs.c z-mterm2.c z-opac.c \
@@ -87,7 +96,7 @@ libyaz_la_SOURCES=version.c options.c log.c \
   grs1disp.c zgdu.c soap.c srw.c srwutil.c \
   opacdisp.c cclfind.c ccltoken.c cclerrms.c cclqual.c cclptree.c cclp.h \
   cclqfile.c cclstr.c cclxmlconfig.c ccl_stop_words.c \
-  cql.y cqlstdio.c cqltransform.c cqlutil.c xcqlutil.c cqlstring.c \
+  cql.y cqlstdio.c cqltransform.c cqlutil.c xcqlutil.c cqlstring.c rpn2cql.c \
   cqlstrer.c querytowrbuf.c \
   tcpdchk.c \
   test.c timing.c \
@@ -96,12 +105,12 @@ libyaz_la_SOURCES=version.c options.c log.c \
   record_conv.c retrieval.c elementset.c snprintf.c query-charset.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_marc8.c iconv_decode_iso5426.c iconv_decode_danmarc.c sc.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 service.c service.h mutex.c
+  requestq.c eventl.h session.h mutex.c
 
 libyaz_server_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)