X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=793362292e1e51a9c79327b830fdce88d4ad71eb;hp=83e3bcbd972184ccf7185bcb9262acf5240f6758;hb=7dc39ebcca4138d27f9a0e5082b2829a7c96375a;hpb=732cf4e1fbb015bc2090a8dd43dd16bd88d3ffc2

diff --git a/win/makefile b/win/makefile
index 83e3bcb..7933622 100644
--- 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_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
@@ -122,9 +126,10 @@ YAZ_MARCDUMP=$(BINDIR)\yaz-marcdump.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)
 
@@ -135,7 +140,7 @@ zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
  $(ZOOMTST10)
 
 utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP) 
-testprog: $(TSTLOG) $(TST_TIMING)
+testprog: $(TSTLOG) $(TST_TIMING) $(TEST_MUTEX)
 
 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)
 
-COMMON_LNK_OPTIONS= /nologo /subsystem:windows /machine:i386 /incremental:no
+COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no
 
 DEBUG_LNK_OPTIONS= /debug 
 
@@ -323,6 +328,7 @@ YAZ_CLIENT_OBJS= \
    $(OBJDIR)\fhistory.obj
 
 YAZ_ICU_OBJS= $(OBJDIR)\yaz-icu.obj 
+COND_DLL_OBJS= $(OBJDIR)\condvar.obj
 
 ZTEST_OBJS= \
     $(OBJDIR)\dummy-opac.obj \
@@ -371,6 +377,9 @@ TSTLOG_OBJS = \
 TST_TIMING_OBJS = \
    $(OBJDIR)\test_timing.obj
 
+TEST_MUTEX_OBJS = \
+   $(OBJDIR)\test_mutex.obj
+
 MISC_OBJS= \
    $(OBJDIR)\version.obj \
    $(OBJDIR)\oid_std.obj \
@@ -495,10 +504,14 @@ MISC_OBJS= \
    $(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)\thread_id.obj \
    $(OBJDIR)\dirent.obj
 
 Z3950_OBJS= \
@@ -837,6 +850,14 @@ $(YAZ_ICU_DLL) $(YAZ_ICU_IMPLIB): "$(BINDIR)" $(ICU_DLL_OBJS) $(YAZ_ICU_RES)
 		/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
@@ -919,6 +940,10 @@ $(TST_TIMING) : "$(BINDIR)" $(TST_TIMING_OBJS) $(YAZ_DLL)
 	$(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