X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=ec1ea462931dac1a816831daf0e7fdf6bd70bc7f;hp=51e6d1c359cfb1fbe9686047dafe01b3ce4807bc;hb=2729cd06642622e1355f41f947498902e6dde61a;hpb=8cd8912e4ff99fd53ff78a028f7d84418e494b0d diff --git a/win/makefile b/win/makefile index 51e6d1c..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 @@ -43,7 +43,7 @@ BISON=bison default: all all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog \ - testprog iconv icu libxml2 libxslt $(YAZ_URL) + testprog iconv icu libxml2 libxslt yaz_url NSIS="c:\program files\nsis\makensis.exe" HHC="c:\program files\html help workshop\hhc.exe" @@ -155,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) @@ -398,6 +400,7 @@ TEST_MUTEX_OBJS = \ $(OBJDIR)\test_mutex.obj MISC_OBJS= \ + $(OBJDIR)\diag_map.obj \ $(OBJDIR)\base64.obj \ $(OBJDIR)\version.obj \ $(OBJDIR)\oid_std.obj \ @@ -486,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 \ @@ -504,6 +508,7 @@ 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 \ @@ -861,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