projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'solr_client' of ssh://git.indexdata.com/home/git/pub/yaz into solr_client
[yaz-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
83e3bcb
..
cebd865
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-92,11
+92,15
@@
YAZ_DLL=$(BINDIR)\yaz4d.dll
YAZ_IMPLIB=$(LIBDIR)\yaz4d.lib
YAZ_ICU_DLL=$(BINDIR)\yaz_icu4d.dll
YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu4d.lib
YAZ_IMPLIB=$(LIBDIR)\yaz4d.lib
YAZ_ICU_DLL=$(BINDIR)\yaz_icu4d.dll
YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu4d.lib
+YAZ_COND_DLL=$(BINDIR)\yaz_cond4d.dll
+YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond4d.lib
!else
YAZ_DLL=$(BINDIR)\yaz4.dll
YAZ_IMPLIB=$(LIBDIR)\yaz4.lib
YAZ_ICU_DLL=$(BINDIR)\yaz_icu4.dll
YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu4.lib
!else
YAZ_DLL=$(BINDIR)\yaz4.dll
YAZ_IMPLIB=$(LIBDIR)\yaz4.lib
YAZ_ICU_DLL=$(BINDIR)\yaz_icu4.dll
YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu4.lib
+YAZ_COND_DLL=$(BINDIR)\yaz_cond4.dll
+YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond4.lib
!endif
CLIENT=$(BINDIR)\yaz-client.exe
!endif
CLIENT=$(BINDIR)\yaz-client.exe
@@
-122,9
+126,10
@@
YAZ_MARCDUMP=$(BINDIR)\yaz-marcdump.exe
TSTLOG=$(BINDIR)\test_log.exe
TST_TIMING=$(BINDIR)\test_timing.exe
TSTLOG=$(BINDIR)\test_log.exe
TST_TIMING=$(BINDIR)\test_timing.exe
+TEST_MUTEX=$(BINDIR)\test_mutex.exe
# shortcut names defined here
# shortcut names defined here
-dll: dirs generate $(YAZ_DLL)
+dll: dirs generate $(YAZ_DLL) $(YAZ_COND_DLL)
client: dirs generate $(CLIENT)
ztest: dirs generate $(ZTEST)
client: dirs generate $(CLIENT)
ztest: dirs generate $(ZTEST)
@@
-135,7
+140,7
@@
zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
$(ZOOMTST10)
utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP)
$(ZOOMTST10)
utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP)
-testprog: $(TSTLOG) $(TST_TIMING)
+testprog: $(TSTLOG) $(TST_TIMING) $(TEST_MUTEX)
htmlhelp: $(DOCDIR)\htmlhelp.chm
htmlhelp: $(DOCDIR)\htmlhelp.chm
@@
-281,7
+286,7
@@
MT=echo
LINK_LIBS= kernel32.lib ws2_32.lib advapi32.lib \
$(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
LINK_LIBS= kernel32.lib ws2_32.lib advapi32.lib \
$(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
-COMMON_LNK_OPTIONS= /nologo /subsystem:windows /machine:i386 /incremental:no
+COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no
DEBUG_LNK_OPTIONS= /debug
DEBUG_LNK_OPTIONS= /debug
@@
-323,6
+328,7
@@
YAZ_CLIENT_OBJS= \
$(OBJDIR)\fhistory.obj
YAZ_ICU_OBJS= $(OBJDIR)\yaz-icu.obj
$(OBJDIR)\fhistory.obj
YAZ_ICU_OBJS= $(OBJDIR)\yaz-icu.obj
+COND_DLL_OBJS= $(OBJDIR)\condvar.obj
ZTEST_OBJS= \
$(OBJDIR)\dummy-opac.obj \
ZTEST_OBJS= \
$(OBJDIR)\dummy-opac.obj \
@@
-371,6
+377,9
@@
TSTLOG_OBJS = \
TST_TIMING_OBJS = \
$(OBJDIR)\test_timing.obj
TST_TIMING_OBJS = \
$(OBJDIR)\test_timing.obj
+TEST_MUTEX_OBJS = \
+ $(OBJDIR)\test_mutex.obj
+
MISC_OBJS= \
$(OBJDIR)\version.obj \
$(OBJDIR)\oid_std.obj \
MISC_OBJS= \
$(OBJDIR)\version.obj \
$(OBJDIR)\oid_std.obj \
@@
-461,9
+470,17
@@
MISC_OBJS= \
$(OBJDIR)\opacdisp.obj \
$(OBJDIR)\zgdu.obj \
$(OBJDIR)\soap.obj \
$(OBJDIR)\opacdisp.obj \
$(OBJDIR)\zgdu.obj \
$(OBJDIR)\soap.obj \
+ $(OBJDIR)\solr.obj \
$(OBJDIR)\srw.obj \
$(OBJDIR)\srwutil.obj \
$(OBJDIR)\zoom-c.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 \
$(OBJDIR)\zoom-opt.obj \
$(OBJDIR)\zoom-socket.obj \
$(OBJDIR)\initopt.obj \
@@
-495,10
+512,14
@@
MISC_OBJS= \
$(OBJDIR)\iconv_decode_iso5426.obj \
$(OBJDIR)\iconv_decode_danmarc.obj \
$(OBJDIR)\mutex.obj \
$(OBJDIR)\iconv_decode_iso5426.obj \
$(OBJDIR)\iconv_decode_danmarc.obj \
$(OBJDIR)\mutex.obj \
+ $(OBJDIR)\thread_create.obj \
+ $(OBJDIR)\spipe.obj \
+ $(OBJDIR)\gettimeofday.obj \
$(OBJDIR)\json.obj \
$(OBJDIR)\sc.obj \
$(OBJDIR)\xml_include.obj \
$(OBJDIR)\file_glob.obj \
$(OBJDIR)\json.obj \
$(OBJDIR)\sc.obj \
$(OBJDIR)\xml_include.obj \
$(OBJDIR)\file_glob.obj \
+ $(OBJDIR)\thread_id.obj \
$(OBJDIR)\dirent.obj
Z3950_OBJS= \
$(OBJDIR)\dirent.obj
Z3950_OBJS= \
@@
-531,7
+552,8
@@
Z3950_OBJS= \
$(OBJDIR)\prt-ext.obj \
$(OBJDIR)\z-charneg.obj \
$(OBJDIR)\z-mterm2.obj \
$(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\
ILL_OBJS= \
$(OBJDIR)\ill-get.obj\
@@
-586,6
+608,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
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 \
# Files created from z3950v3.asn
Z3950V3_H_FILES= \
$(INCLDIR)\yaz\z-accdes1.h \
@@
-640,6
+666,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)
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) \
GENERATED_C_FILES= \
$(Z3950V3_C_FILES) \
@@
-650,6
+677,7
@@
GENERATED_C_FILES= \
$(CHARNEG_C_FILES) \
$(MTERM2_C_FILES) \
$(OCLCUI_C_FILES) \
$(CHARNEG_C_FILES) \
$(MTERM2_C_FILES) \
$(OCLCUI_C_FILES) \
+ $(FACET_C_FILES) \
$(ILL_CORE_C_FILES) \
$(ITEM_REQ_C_FILES)
$(ILL_CORE_C_FILES) \
$(ITEM_REQ_C_FILES)
@@
-662,6
+690,7
@@
GENERATED_H_FILES= \
$(CHARNEG_H_FILES) \
$(MTERM2_H_FILES) \
$(OCLCUI_H_FILES) \
$(CHARNEG_H_FILES) \
$(MTERM2_H_FILES) \
$(OCLCUI_H_FILES) \
+ $(FACET_H_FILES) \
$(ILL_CORE_H_FILES) \
$(ITEM_REQ_H_FILES)
$(ILL_CORE_H_FILES) \
$(ITEM_REQ_H_FILES)
@@
-747,6
+776,11
@@
$(OCLCUI_FILES): $(SRCDIR)\oclcui.asn
$(TCL) $(TCLOPT) -d z.tcl oclcui.asn
@cd $(WINDIR)
$(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
$(ILL_CORE_FILES): $(SRCDIR)\ill9702.asn
@cd $(SRCDIR)
$(TCL) $(TCLOPT) -d ill.tcl ill9702.asn
@@
-837,6
+871,14
@@
$(YAZ_ICU_DLL) $(YAZ_ICU_IMPLIB): "$(BINDIR)" $(ICU_DLL_OBJS) $(YAZ_ICU_RES)
/implib:"$(YAZ_ICU_IMPLIB)"
$(MT) -manifest $@.manifest -outputresource:$@;2
/implib:"$(YAZ_ICU_IMPLIB)"
$(MT) -manifest $@.manifest -outputresource:$@;2
+$(YAZ_COND_DLL) $(YAZ_COND_IMPLIB): "$(BINDIR)" $(COND_DLL_OBJS) $(YAZ_COND_RES)
+ $(LINK_DLL) $(COND_LIB) $(YAZ_IMPLIB)\
+ $(COND_DLL_OBJS) \
+ $(YAZ_COND_RES) \
+ /out:$@ \
+ /implib:"$(YAZ_COND_IMPLIB)"
+ $(MT) -manifest $@.manifest -outputresource:$@;2
+
$(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_CLIENT_OBJS) /out:$@
$(MT) -manifest $@.manifest -outputresource:$@;1
$(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_CLIENT_OBJS) /out:$@
$(MT) -manifest $@.manifest -outputresource:$@;1
@@
-919,6
+961,10
@@
$(TST_TIMING) : "$(BINDIR)" $(TST_TIMING_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(TST_TIMING_OBJS) /out:$@
$(MT) -manifest $@.manifest -outputresource:$@;1
$(LINK_PROGRAM) $(TST_TIMING_OBJS) /out:$@
$(MT) -manifest $@.manifest -outputresource:$@;1
+$(TEST_MUTEX) : "$(BINDIR)" $(TEST_MUTEX_OBJS) $(YAZ_COND_DLL)
+ $(LINK_PROGRAM) $(YAZ_COND_IMPLIB) $(TEST_MUTEX_OBJS) /out:$@
+ $(MT) -manifest $@.manifest -outputresource:$@;1
+
# Other rules
$(DOCDIR)\htmlhelp.chm: $(DOCDIR)\htmlhelp.hhp
# Other rules
$(DOCDIR)\htmlhelp.chm: $(DOCDIR)\htmlhelp.hhp