# This file is part of the YAZ toolkit.
-# Copyright (C) 1995-2009 Index Data
-#
-# Programmed by
-# Heikki Levanto & Adam Dickmeiss
+# Copyright (C) 1995-2010 Index Data
# Parameters
DEBUG=0 # 0 for release, 1 for debug
-USE_MANIFEST = 0
+USE_MANIFEST = 1
# TCL
TCL="C:\Tcl\bin\tclsh85.exe"
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
+YAZ_COND_DLL=$(BINDIR)\yaz_cond4.dll
+YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond4.lib
!endif
CLIENT=$(BINDIR)\yaz-client.exe
CQL2XCQL=$(BINDIR)\cql2xcql.exe
YAZ_MARCDUMP=$(BINDIR)\yaz-marcdump.exe
-TSTLOG=$(BINDIR)\tstlog.exe
-TST_TIMING=$(BINDIR)\tst_timing.exe
+TSTLOG=$(BINDIR)\test_log.exe
+TST_TIMING=$(BINDIR)\test_timing.exe
+TEST_MUTEX=$(BINDIR)\test_mutex.exe
# 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)
$(ZOOMTST10)
utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP)
-testprog: $(TSTLOG) $(TST_TIMING)
+testprog: $(TSTLOG) $(TST_TIMING) $(TEST_MUTEX)
htmlhelp: $(DOCDIR)\htmlhelp.chm
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
$(OBJDIR)\fhistory.obj
YAZ_ICU_OBJS= $(OBJDIR)\yaz-icu.obj
+COND_DLL_OBJS= $(OBJDIR)\condvar.obj
ZTEST_OBJS= \
$(OBJDIR)\dummy-opac.obj \
TSTLOG_OBJS = \
- $(OBJDIR)\tstlog.obj
+ $(OBJDIR)\test_log.obj
TST_TIMING_OBJS = \
- $(OBJDIR)\tst_timing.obj
+ $(OBJDIR)\test_timing.obj
+
+TEST_MUTEX_OBJS = \
+ $(OBJDIR)\test_mutex.obj
MISC_OBJS= \
$(OBJDIR)\version.obj \
$(OBJDIR)\iso5426.obj \
$(OBJDIR)\record_conv.obj \
$(OBJDIR)\retrieval.obj \
- $(OBJDIR)\libxml2_error.obj \
$(OBJDIR)\test.obj \
$(OBJDIR)\diagbib1.obj \
$(OBJDIR)\diagsru_update.obj \
$(OBJDIR)\srw.obj \
$(OBJDIR)\srwutil.obj \
$(OBJDIR)\zoom-c.obj \
+ $(OBJDIR)\zoom-z3950.obj \
+ $(OBJDIR)\zoom-query.obj \
+ $(OBJDIR)\facet.obj \
$(OBJDIR)\zoom-opt.obj \
$(OBJDIR)\zoom-socket.obj \
$(OBJDIR)\initopt.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)\sc.obj \
+ $(OBJDIR)\xml_include.obj \
+ $(OBJDIR)\file_glob.obj \
+ $(OBJDIR)\thread_id.obj \
+ $(OBJDIR)\dirent.obj
Z3950_OBJS= \
$(OBJDIR)\z-date.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\
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 \
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) \
$(CHARNEG_C_FILES) \
$(MTERM2_C_FILES) \
$(OCLCUI_C_FILES) \
+ $(FACET_C_FILES) \
$(ILL_CORE_C_FILES) \
$(ITEM_REQ_C_FILES)
$(CHARNEG_H_FILES) \
$(MTERM2_H_FILES) \
$(OCLCUI_H_FILES) \
+ $(FACET_H_FILES) \
$(ILL_CORE_H_FILES) \
$(ITEM_REQ_H_FILES)
$(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
@cd $(SRCDIR)
$(TCL) csvtosru_update.tcl $(SRCDIR)
-$(INCLDIR)\yaz\yaz-version.h:
+$(INCLDIR)\yaz\yaz-version.h: $(ROOTDIR)/configure.ac
@cd $(SRCDIR)
$(TCL) mk_version.tcl $(ROOTDIR)/configure.ac $(INCLDIR)\yaz\yaz-version.h
/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
$(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