Add missing SOLR obj for Windows

[yaz-moved-to-github.git] / win / makefile

diff --git a/win/makefile b/win/makefile
index 7933622..f576a01 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -45,14 +45,23 @@ all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog testprog icon
 NSIS="c:\program files\nsis\makensis.exe"
 HHC="c:\program files\html help workshop\hhc.exe"
 
-dist: yaz.nsi
+dist: yaz.win32.nsi yaz.nsi distclean
+       nmake DEBUG=0
+       $(NSIS) yaz.win32.nsi
+
+dist64: yaz.win64.nsi yaz.nsi distclean
+       nmake DEBUG=0 HAVE_LIBXSLT=0 HAVE_LIBXML2=0 HAVE_ICONV=0 HAVE_ICU=0
+       $(NSIS) yaz.win64.nsi
+
+distclean:
        nmake DEBUG=1 clean
        nmake DEBUG=0 clean
-       nmake DEBUG=0
-       $(NSIS) yaz.nsi
 
-nsis: all yaz.nsi
-       $(NSIS) yaz.nsi
+nsis: all yaz32.nsi
+       $(NSIS) yaz.win32.nsi
+
+nsis64: yaz.win64.nsi
+       $(NSIS) yaz.win64.nsi
 
 nsishelp:
        $(NSIS)
@@ -470,9 +479,18 @@ MISC_OBJS= \
    $(OBJDIR)\opacdisp.obj \
    $(OBJDIR)\zgdu.obj \
    $(OBJDIR)\soap.obj \
+   $(OBJDIR)\solr.obj \
+   $(OBJDIR)\solrtransform.obj \
    $(OBJDIR)\srw.obj \
    $(OBJDIR)\srwutil.obj \
    $(OBJDIR)\zoom-c.obj \
+   $(OBJDIR)\zoom-event.obj \
+   $(OBJDIR)\zoom-record-cache.obj \
+   $(OBJDIR)\zoom-z3950.obj \
+   $(OBJDIR)\zoom-sru.obj \
+   $(OBJDIR)\zoom-query.obj \
+   $(OBJDIR)\record_render.obj \
+   $(OBJDIR)\facet.obj \
    $(OBJDIR)\zoom-opt.obj \
    $(OBJDIR)\zoom-socket.obj \
    $(OBJDIR)\initopt.obj \
@@ -486,6 +504,7 @@ MISC_OBJS= \
    $(OBJDIR)\cqlutil.obj \
    $(OBJDIR)\cqlstrer.obj \
    $(OBJDIR)\rpn2cql.obj \
+   $(OBJDIR)\rpn2solr.obj \
    $(OBJDIR)\xcqlutil.obj \
    $(OBJDIR)\elementset.obj \
    $(OBJDIR)\timing.obj \
@@ -544,7 +563,8 @@ Z3950_OBJS= \
    $(OBJDIR)\prt-ext.obj \
    $(OBJDIR)\z-charneg.obj \
    $(OBJDIR)\z-mterm2.obj \
-   $(OBJDIR)\z-oclcui.obj
+   $(OBJDIR)\z-oclcui.obj \
+   $(OBJDIR)\z-facet-1.obj
 
 ILL_OBJS= \
    $(OBJDIR)\ill-get.obj\
@@ -599,6 +619,10 @@ MTERM2_C_FILES = $(Z3950_C_DIR)\z-mterm2.c
 OCLCUI_H_FILES = $(INCLDIR)\yaz\z-oclcui.h
 OCLCUI_C_FILES = $(Z3950_C_DIR)\z-oclcui.c
 
+# Files generated from facet.asn
+FACET_H_FILES = $(INCLDIR)\yaz\z-facet-1.h
+FACET_C_FILES = $(Z3950_C_DIR)\z-facet-1.c
+
 # Files created from z3950v3.asn
 Z3950V3_H_FILES= \
    $(INCLDIR)\yaz\z-accdes1.h \
@@ -653,6 +677,7 @@ ITEM_REQ_FILES= $(ITEM_REQ_C_FILES) $(ITEM_REQ_H_FILES)
 CHARNEG_FILES = $(CHARNEG_C_FILES) $(CHARNEG_H_FILES)
 MTERM2_FILES = $(MTERM2_C_FILES) $(MTERM2_H_FILES)
 OCLCUI_FILES = $(OCLCUI_C_FILES) $(OCLCUI_H_FILES)
+FACET_FILES = $(FACET_C_FILES) $(FACET_H_FILES)
 
 GENERATED_C_FILES= \
    $(Z3950V3_C_FILES)  \
@@ -663,6 +688,7 @@ GENERATED_C_FILES= \
    $(CHARNEG_C_FILES) \
    $(MTERM2_C_FILES) \
    $(OCLCUI_C_FILES) \
+   $(FACET_C_FILES) \
    $(ILL_CORE_C_FILES) \
    $(ITEM_REQ_C_FILES)
 
@@ -675,6 +701,7 @@ GENERATED_H_FILES= \
    $(CHARNEG_H_FILES) \
    $(MTERM2_H_FILES) \
    $(OCLCUI_H_FILES) \
+   $(FACET_H_FILES) \
    $(ILL_CORE_H_FILES) \
    $(ITEM_REQ_H_FILES)
 
@@ -760,6 +787,11 @@ $(OCLCUI_FILES): $(SRCDIR)\oclcui.asn
        $(TCL) $(TCLOPT) -d z.tcl oclcui.asn
        @cd $(WINDIR)
 
+$(FACET_FILES): $(SRCDIR)\facet.asn
+       @cd $(SRCDIR)
+       $(TCL) $(TCLOPT) -d z.tcl facet.asn
+       @cd $(WINDIR)
+
 $(ILL_CORE_FILES): $(SRCDIR)\ill9702.asn
        @cd $(SRCDIR)
        $(TCL) $(TCLOPT) -d ill.tcl ill9702.asn