X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=8bbd1e9f12dd33f48f59e0a08712086d1d8f823e;hp=aab1ff9bf85a8b1e634370b894ca3815208937db;hb=2ba84b155219d5d18eed5ba4d929c12abdb88f14;hpb=6938850d6b09e61ffde4c17c5682f7be5597e63f

diff --git a/win/makefile b/win/makefile
index aab1ff9..8bbd1e9 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,17 +1,16 @@
-# Copyright (C) 1995-2008, Index Data ApS
-# All rights reserved.
-# $Id: makefile,v 1.143 2008-01-17 22:27:40 adam Exp $
+# This file is part of the YAZ toolkit.
+# Copyright (C) 1995-2008 Index Data
 #
 # Programmed by
 #  Heikki Levanto & Adam Dickmeiss
 
 # Parameters 
 
-DEBUG=0   # 0 for release, 1 for debug
+DEBUG=1   # 0 for release, 1 for debug
 USE_MANIFEST = 0
 
 # TCL
-TCL="C:\Tcl\bin\tclsh84.exe"
+TCL="C:\Tcl\bin\tclsh85.exe"
 #TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
 HAVE_TCL=1
 
@@ -26,11 +25,11 @@ ICU_DIR = c:\icu
 
 # libxslt
 HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.19.win32
+LIBXSLT_DIR=c:\libxslt-1.1.24.win32
 
 # libxml2
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.28.win32
+LIBXML2_DIR=c:\libxml2-2.7.1.win32
 
 # zlib compression (used by libxml2)
 ZLIB_DIR = c:\zlib-1.2.3.win32
@@ -44,7 +43,7 @@ BISON=bison
 
 default: all
 
-all: dirs generate dll client ztest yazicu zoomsh utilprog testprog iconv icu libxml2 libxslt
+all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog testprog iconv icu libxml2 libxslt
 
 NSIS="c:\program files\nsis\makensis.exe"
 HHC="c:\program files\html help workshop\hhc.exe"
@@ -109,6 +108,7 @@ CLIENT=$(BINDIR)\yaz-client.exe
 YAZ_ICU=$(BINDIR)\yaz-icu.exe
 ZOOMSH=$(BINDIR)\zoomsh.exe
 ZTEST=$(BINDIR)\yaz-ztest.exe
+SC_TEST=$(BINDIR)\sc_test.exe
 
 ZOOMTST1=$(BINDIR)\zoomtst1.exe
 ZOOMTST2=$(BINDIR)\zoomtst2.exe
@@ -133,6 +133,8 @@ dll: dirs generate $(YAZ_DLL)
 client: dirs generate $(CLIENT)
 ztest: dirs generate $(ZTEST)
 
+sc_test: $(SC_TEST)
+
 zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
  $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8) $(ZOOMTST9) \
  $(ZOOMTST10)
@@ -172,15 +174,15 @@ ICU_DEF= \
   /I"$(ICU_DIR)\include"
 ICU_LIB= \
   $(ICU_DIR)\lib\icudt.lib $(ICU_DIR)\lib\icuin.lib $(ICU_DIR)\lib\icuuc.lib
-icu: $(BINDIR)\icudt38.dll $(BINDIR)\icuin38.dll $(BINDIR)\icuuc38.dll
+icu: $(BINDIR)\icudt40.dll $(BINDIR)\icuin40.dll $(BINDIR)\icuuc40.dll
 yazicu: dirs generate $(YAZ_ICU) 
 
-$(BINDIR)\icudt38.dll:
-  copy "$(ICU_DIR)\bin\icudt38.dll" $(BINDIR)
-$(BINDIR)\icuin38.dll:
-  copy "$(ICU_DIR)\bin\icuin38.dll" $(BINDIR)
-$(BINDIR)\icuuc38.dll:
-  copy "$(ICU_DIR)\bin\icuuc38.dll" $(BINDIR)
+$(BINDIR)\icudt40.dll:
+  copy "$(ICU_DIR)\bin\icudt40.dll" $(BINDIR)
+$(BINDIR)\icuin40.dll:
+  copy "$(ICU_DIR)\bin\icuin40.dll" $(BINDIR)
+$(BINDIR)\icuuc40.dll:
+  copy "$(ICU_DIR)\bin\icuuc40.dll" $(BINDIR)
 !else
 ICU_DEF= \
   /D YAZ_HAVE_ICU=0
@@ -281,7 +283,7 @@ MT=mt.exe /nologo
 MT=echo
 !endif
 
-LINK_LIBS= kernel32.lib wsock32.lib advapi32.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
@@ -328,10 +330,14 @@ YAZ_CLIENT_OBJS= \
 YAZ_ICU_OBJS= $(OBJDIR)\yaz-icu.obj 
 
 ZTEST_OBJS= \
+    $(OBJDIR)\dummy-opac.obj \
     $(OBJDIR)\read-marc.obj \
     $(OBJDIR)\read-grs.obj \
     $(OBJDIR)\ztest.obj 
 
+SC_TEST_OBJS = \
+   $(OBJDIR)\sc_test.obj
+
 YAZ_ZOOMSH_OBJS = \
    $(OBJDIR)\zoomsh.obj
 
@@ -375,7 +381,6 @@ MISC_OBJS= \
    $(OBJDIR)\oid_std.obj \
    $(OBJDIR)\eventl.obj \
    $(OBJDIR)\requestq.obj \
-   $(OBJDIR)\service.obj \
    $(OBJDIR)\seshigh.obj \
    $(OBJDIR)\statserv.obj \
    $(OBJDIR)\tcpdchk.obj \
@@ -433,6 +438,10 @@ MISC_OBJS= \
    $(OBJDIR)\xmalloc.obj \
    $(OBJDIR)\matchstr.obj \
    $(OBJDIR)\siconv.obj \
+   $(OBJDIR)\iso5428.obj \
+   $(OBJDIR)\utf8.obj \
+   $(OBJDIR)\ucs4.obj \
+   $(OBJDIR)\advancegreek.obj \
    $(OBJDIR)\snprintf.obj \
    $(OBJDIR)\marc8.obj \
    $(OBJDIR)\marc8r.obj \
@@ -463,6 +472,7 @@ MISC_OBJS= \
    $(OBJDIR)\zoom-socket.obj \
    $(OBJDIR)\initopt.obj \
    $(OBJDIR)\xmlquery.obj \
+   $(OBJDIR)\xmlerror.obj \
    $(OBJDIR)\mime.obj \
    $(OBJDIR)\cql.obj \
    $(OBJDIR)\cqlstdio.obj \
@@ -470,6 +480,7 @@ MISC_OBJS= \
    $(OBJDIR)\cqltransform.obj \
    $(OBJDIR)\cqlutil.obj \
    $(OBJDIR)\cqlstrer.obj \
+   $(OBJDIR)\rpn2cql.obj \
    $(OBJDIR)\xcqlutil.obj \
    $(OBJDIR)\elementset.obj \
    $(OBJDIR)\timing.obj \
@@ -479,6 +490,13 @@ MISC_OBJS= \
    $(OBJDIR)\http.obj \
    $(OBJDIR)\match_glob.obj \
    $(OBJDIR)\poll.obj \
+   $(OBJDIR)\daemon.obj \
+   $(OBJDIR)\iconv_encode_iso_8859_1.obj \
+   $(OBJDIR)\iconv_encode_marc8.obj \
+   $(OBJDIR)\iconv_decode_marc8.obj \
+   $(OBJDIR)\iconv_encode_wchar.obj \
+   $(OBJDIR)\mutex.obj \
+   $(OBJDIR)\sc.obj
 
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
@@ -765,12 +783,10 @@ $(SRCDIR)\cql.c: $(SRCDIR)\cql.y
 # Resources
 # The RC compiler (resource files)
 RSC=rc.exe
-COMMON_RC_OPTIONS= /l 0x406 /i"$(ROOTDIR)" 
-DEBUG_RC_OPTIONS=/d "_DEBUG"
-RELEASE_RC_OPTIONS=/d "NDEBUG"
 
-YAZ_RES=$(OBJDIR)\yaz.res
 YAZ_RC=$(WINDIR)\yaz.rc
+YAZ_RES=$(OBJDIR)\yaz.res
+YAZ_ICU_RES=$(OBJDIR)\yaz_icu.res
 
 !if $(DEBUG)
 RSOPT=/d_DEBUG
@@ -781,6 +797,9 @@ RSOPT=/d_NDEBUG
 $(YAZ_RES): $(YAZ_RC)
 	$(RSC) $(RSOPT) /I"../include" /fo"$(YAZ_RES)" $(YAZ_RC) 
 
+$(YAZ_ICU_RES): $(YAZ_RC)
+	$(RSC) $(RSOPT) /DICU=1 /I"../include" /fo"$(YAZ_ICU_RES)" $(YAZ_RC) 
+
 # Linking
 
 $(YAZ_DLL) $(YAZ_IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
@@ -791,9 +810,10 @@ $(YAZ_DLL) $(YAZ_IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
 		/implib:"$(YAZ_IMPLIB)" 
 	$(MT) -manifest $@.manifest -outputresource:$@;2
 
-$(YAZ_ICU_DLL) $(YAZ_ICU_IMPLIB): "$(BINDIR)" $(ICU_DLL_OBJS) $(YAZ_RES)
+$(YAZ_ICU_DLL) $(YAZ_ICU_IMPLIB): "$(BINDIR)" $(ICU_DLL_OBJS) $(YAZ_ICU_RES)
 	$(LINK_DLL) $(ICU_LIB) $(YAZ_IMPLIB)\
 		$(ICU_DLL_OBJS) \
+		$(YAZ_ICU_RES) \
 		/out:$@ \
 		/implib:"$(YAZ_ICU_IMPLIB)" 
 	$(MT) -manifest $@.manifest -outputresource:$@;2
@@ -807,6 +827,10 @@ $(YAZ_ICU) : "$(BINDIR)" $(YAZ_ICU_OBJS) $(YAZ_ICU_DLL)
 	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 
+$(SC_TEST) : "$(BINDIR)" $(SC_TEST_OBJS) $(YAZ_DLL)
+	$(LINK_PROGRAM) $(SC_TEST_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
+
 $(ZOOMSH) : "$(BINDIR)" $(YAZ_ZOOMSH_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_ZOOMSH_OBJS) /out:$@
 	$(MT) -manifest $@.manifest -outputresource:$@;1