X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=cae6a842024f54eac201b7833f2912778c67e8bb;hb=cc078710f81ae60a8922044313b5c4733ac90639;hp=c033231ea40c506d2fe26ade8f979f9ac47581b4;hpb=300533a2f4f573ca4b40697c19ae1af61607a6be;p=yaz-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index c033231..cae6a84 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
-# Copyright (C) 1994-2005, Index Data ApS
+# Copyright (C) 1994-2006, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.99 2006-02-01 20:14:31 adam Exp $
+# $Id: makefile,v 1.111 2006-06-07 14:25:43 adam Exp $
 #
 # Programmed by
 #  Heikki Levanto & Adam Dickmeiss
@@ -20,6 +20,10 @@ HAVE_TCL=1
 HAVE_ICONV=1
 ICONV_DIR = c:\iconv-1.9.1.win32
 
+# libxslt
+HAVE_LIBXSLT=1
+LIBXSLT_DIR=c:\libxslt-1.1.14.win32
+
 # libxml2
 HAVE_LIBXML2=1
 LIBXML2_DIR=c:\libxml2-2.6.20.win32
@@ -36,7 +40,7 @@ BISON=bison
 
 default: all
 
-all: dirs generate dll client ztest zoomsh utilprog testprog iconv libxml2
+all: dirs generate dll client ztest zoomsh utilprog testprog iconv libxml2 libxslt
 
 NSIS="c:\program files\nsis\makensis.exe"
 HHC="c:\program files\html help workshop\hhc.exe"
@@ -173,15 +177,35 @@ libxml2:
 
 !endif
 
+!if $(HAVE_LIBXSLT)
+LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib"
+LIBXSLT_DEF= \
+	/D HAVE_XSLTSAVERESULTTOSTRING=1 \
+	/D HAVE_XSLT=1 \
+	/I"$(LIBXSLT_DIR)\include"
+libxslt: $(BINDIR)\libxslt.dll
+
+$(BINDIR)\libxslt.dll:
+  copy "$(LIBXSLT_DIR)\bin\libxslt.dll" $(BINDIR)
+
+!else
+LIBXSLT_LIB=
+LIBXSLT_DEF=/D HAVE_XSLT=0
+libxslt: 
+!endif
+
 
 ### C and CPP compiler  (the same thing)
 # Note: $(CPP) has already been defined in the environment
 # (if you set things up right!)
 
 COMMON_C_OPTIONS=          \
-  /nologo /W3 /GX /FD /c   \
+  /nologo /W3 /EHsc /FD /c   \
   $(ICONV_DEF)             \
   $(LIBXML2_DEF)           \
+  $(LIBXSLT_DEF)           \
+  /D "_CRT_SECURE_NO_DEPRECATE" \
+  /D "_CRT_NONSTDC_NO_DEPRECATE" \
   /D "_WINDOWS"            \
   /D "WIN32"               \
   /FR"$(OBJDIR)\\"         \
@@ -193,7 +217,7 @@ COMMON_C_INCLUDES= \
 
 DEBUG_C_OPTIONS=  \
   /D "_DEBUG"      \
-  /MDd  /Od /YX /Zi /Gm
+  /MDd  /Od /Zi /Gm
 
 RELEASE_C_OPTIONS=  \
   /D "NDEBUG"        \
@@ -210,7 +234,6 @@ RELEASE_C_OPTIONS=  \
 # /MDd = Runtime library: Multithread DLL (debug)
 # /Od  = Disable optimising (debug)
 # /O2  = Optimize for speed
-# /YX  = Automatic use of precomipled headers
 # /Gm  = Minimal rebuild (some cpp class stuff)
 # /Zi  = Program database for debuggers
 # /ZI  = Pgm database with special "edit&continue" stuff - not available in C5
@@ -220,9 +243,8 @@ RELEASE_C_OPTIONS=  \
 LINK=link.exe
 
 LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   \
-           advapi32.lib uuid.lib \
-           wsock32.lib  advapi32.lib \
-           $(ICONV_LIB) $(LIBXML2_LIB)
+           advapi32.lib uuid.lib wsock32.lib  advapi32.lib \
+           $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
 
 COMMON_LNK_OPTIONS= /nologo \
                     /subsystem:windows \
@@ -373,6 +395,10 @@ YAZ_UTIL_OBJS= \
    $(OBJDIR)\matchstr.obj \
    $(OBJDIR)\siconv.obj \
    $(OBJDIR)\marc8.obj \
+   $(OBJDIR)\marc8r.obj \
+   $(OBJDIR)\record_conv.obj \
+   $(OBJDIR)\retrieval.obj \
+   $(OBJDIR)\libxml2_error.obj \
    $(OBJDIR)\test.obj
 
 YAZ_ZUTIL_OBJS= \
@@ -397,7 +423,8 @@ YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\zoom-c.obj \
    $(OBJDIR)\zoom-opt.obj \
    $(OBJDIR)\initopt.obj \
-   $(OBJDIR)\xmlquery.obj
+   $(OBJDIR)\xmlquery.obj \
+   $(OBJDIR)\mime.obj
 
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
@@ -583,11 +610,11 @@ generated_files: \
 
 # yaz client
 {$(CLIENTDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< /D"_CONSOLE"
+	$(CPP) $(COPT) $< /D"_CONSOLE"
 
 # Ztest
 {$(ZTESTDIR)}.c{$(OBJDIR)}.obj:
-	@$(CPP) $(COPT) $< /D"_CONSOLE"
+	$(CPP) $(COPT) $< /D"_CONSOLE"
 
 # Server
 {$(SERVERDIR)}.c{$(OBJDIR)}.obj:
@@ -664,13 +691,17 @@ $(SRCDIR)\marc8.c: $(SRCDIR)\codetables.xml $(SRCDIR)\charconv.tcl
 	@cd $(SRCDIR)
 	$(TCL) charconv.tcl -p marc8 codetables.xml -o marc8.c
 
+$(SRCDIR)\marc8r.c: $(SRCDIR)\codetables.xml $(SRCDIR)\charconv.tcl
+	@cd $(SRCDIR)
+	$(TCL) charconv.tcl -r -p marc8r codetables.xml -o marc8r.c
+
 $(SRCDIR)\diagbib1.c: $(SRCDIR)\bib1.csv
 	@cd $(SRCDIR)
-	$(TCL) csvtobib1.tcl
+	$(TCL) csvtobib1.tcl $(SRCDIR)
 
 $(SRCDIR)\diagsrw.c: $(SRCDIR)\srw.csv
 	@cd $(SRCDIR)
-	$(TCL) csvtosrw.tcl
+	$(TCL) csvtosrw.tcl $(SRCDIR)
 
 !endif