X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=ec1ea462931dac1a816831daf0e7fdf6bd70bc7f;hp=05269e8b9064246f1968c481bfe0b3585112e35f;hb=4b92c6833026a51cc391840d1157cd5fefede1df;hpb=4d300e643896e74f94514065da5236fc24f14b13

diff --git a/win/makefile b/win/makefile
index 05269e8..ec1ea46 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # This file is part of the YAZ toolkit.
-# Copyright (C) 1995-2011 Index Data
+# Copyright (C) 1995-2013 Index Data
 
 # Parameters 
 
@@ -42,7 +42,8 @@ BISON=bison
 
 default: all
 
-all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog testprog iconv icu libxml2 libxslt
+all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog \
+ testprog iconv icu libxml2 libxslt yaz_url
 
 NSIS="c:\program files\nsis\makensis.exe"
 HHC="c:\program files\html help workshop\hhc.exe"
@@ -119,6 +120,7 @@ YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond4.lib
 
 CLIENT=$(BINDIR)\yaz-client.exe
 YAZ_ICU=$(BINDIR)\yaz-icu.exe
+YAZ_URL=$(BINDIR)\yaz-url.exe
 ZOOMSH=$(BINDIR)\zoomsh.exe
 ZTEST=$(BINDIR)\yaz-ztest.exe
 SC_TEST=$(BINDIR)\sc_test.exe
@@ -153,6 +155,8 @@ zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
  $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8) $(ZOOMTST9) \
  $(ZOOMTST10)
 
+yaz_url: $(YAZ_URL)
+
 utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP) 
 testprog: $(TSTLOG) $(TST_TIMING) $(TEST_MUTEX)
 
@@ -342,6 +346,7 @@ YAZ_CLIENT_OBJS= \
    $(OBJDIR)\fhistory.obj
 
 YAZ_ICU_OBJS= $(OBJDIR)\yaz-icu.obj 
+YAZ_URL_OBJS= $(OBJDIR)\yaz-url.obj 
 COND_DLL_OBJS= $(OBJDIR)\condvar.obj
 
 ZTEST_OBJS= \
@@ -395,6 +400,8 @@ TEST_MUTEX_OBJS = \
    $(OBJDIR)\test_mutex.obj
 
 MISC_OBJS= \
+   $(OBJDIR)\diag_map.obj \
+   $(OBJDIR)\base64.obj \
    $(OBJDIR)\version.obj \
    $(OBJDIR)\oid_std.obj \
    $(OBJDIR)\eventl.obj \
@@ -409,6 +416,7 @@ MISC_OBJS= \
    $(OBJDIR)\cclqual.obj \
    $(OBJDIR)\cclstr.obj \
    $(OBJDIR)\ccltoken.obj \
+   $(OBJDIR)\cclxmlconfig.obj \
    $(OBJDIR)\ccl_stop_words.obj \
    $(OBJDIR)\comstack.obj \
    $(OBJDIR)\tcpip.obj \
@@ -481,7 +489,8 @@ MISC_OBJS= \
    $(OBJDIR)\sortspec.obj \
    $(OBJDIR)\charneg.obj \
    $(OBJDIR)\grs1disp.obj \
-   $(OBJDIR)\opacdisp.obj \
+   $(OBJDIR)\opac_to_xml.obj \
+   $(OBJDIR)\xml_to_opac.obj \
    $(OBJDIR)\zgdu.obj \
    $(OBJDIR)\soap.obj \
    $(OBJDIR)\solr.obj \
@@ -499,10 +508,13 @@ MISC_OBJS= \
    $(OBJDIR)\zoom-opt.obj \
    $(OBJDIR)\zoom-socket.obj \
    $(OBJDIR)\initopt.obj \
+   $(OBJDIR)\init_diag.obj \
    $(OBJDIR)\xmlquery.obj \
    $(OBJDIR)\xmlerror.obj \
    $(OBJDIR)\mime.obj \
    $(OBJDIR)\cql.obj \
+   $(OBJDIR)\cql2ccl.obj \
+   $(OBJDIR)\cql_sortkeys.obj \
    $(OBJDIR)\cqlstdio.obj \
    $(OBJDIR)\cqlstring.obj \
    $(OBJDIR)\cqltransform.obj \
@@ -536,7 +548,8 @@ MISC_OBJS= \
    $(OBJDIR)\xml_include.obj \
    $(OBJDIR)\file_glob.obj \
    $(OBJDIR)\thread_id.obj \
-   $(OBJDIR)\dirent.obj
+   $(OBJDIR)\dirent.obj \
+   $(OBJDIR)\url.obj
 
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
@@ -853,9 +866,9 @@ $(SRCDIR)\diagsru_update.c: $(SRCDIR)\sru_update.csv
 	@cd $(SRCDIR)
 	$(TCL) csvtosru_update.tcl $(SRCDIR)
 
-$(INCLDIR)\yaz\yaz-version.h: $(ROOTDIR)/configure.ac
+$(INCLDIR)\yaz\yaz-version.h: $(ROOTDIR)/IDMETA
 	@cd $(SRCDIR)
-	$(TCL) mk_version.tcl $(ROOTDIR)/configure.ac $(INCLDIR)\yaz\yaz-version.h
+	$(TCL) mk_version.tcl $(ROOTDIR)/IDMETA $(INCLDIR)\yaz\yaz-version.h
 
 
 !endif
@@ -921,6 +934,9 @@ $(YAZ_ICU) : "$(BINDIR)" $(YAZ_ICU_OBJS) $(YAZ_ICU_DLL)
 	$(LINK_PROGRAM) $(ICU_LIBS) $(YAZ_ICU_IMPLIB) $(YAZ_ICU_OBJS) /out:$@
 	$(MT) -manifest $@.manifest -outputresource:$@;1
 
+$(YAZ_URL) : "$(BINDIR)" $(YAZ_URL_OBJS) $(YAZ_DLL)
+	$(LINK_PROGRAM) $(YAZ_URL_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(SC_TEST) : "$(BINDIR)" $(SC_TEST_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(SC_TEST_OBJS) /out:$@