X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=475951eb86a1d83ddf5cf654bc4d5f401a976a95;hb=274e56850a285f2b4fa1c3e5aafd3dcc2999f990;hp=d6b43d21fafdf216201c3c2e37d4e483d1fe0eb9;hpb=42f18e58ed67f77727cde23bcee44dbd32ed242a;p=yaz-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index d6b43d2..475951e 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,10 +1,9 @@
-# Copyright (C) 1994-2004, Index Data
+# Copyright (C) 1994-2005, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.70 2004-03-10 16:34:31 adam Exp $
+# $Id: makefile,v 1.92 2005-01-19 08:26:59 adam Exp $
 #
 # Programmed by
-#  HL: Heikki Levanto, Index Data
-#
+#  Heikki Levanto & Adam Dickmeiss
 
 ###########################################################
 ############### Parameters 
@@ -19,14 +18,17 @@ HAVE_TCL=1
 
 # iconv charcter conversion utility
 HAVE_ICONV=1
-ICONV_DIR = c:\iconv-1.8.win32
+ICONV_DIR = c:\iconv-1.9.1.win32
 
 # libxml2
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.5.10.win32
+LIBXML2_DIR=c:\libxml2-2.6.15.win32
+
+# zlib compression (used by libxml2)
+ZLIB_DIR = c:\zlib-1.2.1.win32
 
-# WIN32 binaries libxml2 & iconv from here:
-#  http://www.zlatkovic.com/projects/libxml/binaries.html
+# get WIN32 binaries libxml2 & iconv & zlib from here:
+#  http://www.zlatkovic.com/libxml.en.html
 
 # bison
 HAVE_BISON=1
@@ -36,9 +38,15 @@ default: all
 
 all: dirs generate dll client ztest zoomsh utilprog iconv libxml2
 
-NSIS="c:\program files\nsis\makensis-bz2.exe"
+NSIS="c:\program files\nsis\makensis.exe"
+
+dist: 
+	nmake DEBUG=1 clean
+	nmake DEBUG=0 clean
+	nmake DEBUG=0
+	$(NSIS) yaz.nsi
 
-nsis: all
+nsis:
 	$(NSIS) yaz.nsi
 
 nsishelp:
@@ -57,9 +65,15 @@ INCLDIR=$(ROOTDIR)\include  # our includes
 LIBDIR=$(ROOTDIR)\lib       # We produce .lib, .exp etc there
 BINDIR=$(ROOTDIR)\bin       # We produce exes and dlls there
 WINDIR=$(ROOTDIR)\win       # all these Win make things
-OBJDIR=$(WINDIR)\obj        # where we store intermediate files
 SRCDIR=$(ROOTDIR)\src       # for the case we move them under src
 
+# where we store intermediate files
+!if $(DEBUG)
+OBJDIR=$(WINDIR)\dobj
+!else
+OBJDIR=$(WINDIR)\obj
+!endif
+
 CLIENTDIR=$(ROOTDIR)\CLIENT
 ZTESTDIR=$(ROOTDIR)\ZTEST
 ZOOMDIR=$(ROOTDIR)\ZOOM
@@ -72,8 +86,13 @@ TMP=$(TMPDIR)
 ############### Targets - what to make
 ###########################################################
 
+!if $(DEBUG)
+DLL=$(BINDIR)\yazd.dll
+IMPLIB=$(LIBDIR)\yazd.lib
+!else
 DLL=$(BINDIR)\yaz.dll
 IMPLIB=$(LIBDIR)\yaz.lib
+!endif
 
 CLIENT=$(BINDIR)\yaz-client.exe
 ZOOMSH=$(BINDIR)\zoomsh.exe
@@ -93,9 +112,9 @@ CQL2XCQL=$(BINDIR)\cql2xcql.exe
 YAZ_MARCDUMP=$(BINDIR)\yaz-marcdump.exe
 
 # shortcut names defined here
-dll : $(DLL) 
-client: $(CLIENT)
-ztest: $(ZTEST)
+dll: dirs generate $(DLL) 
+client: dirs generate $(CLIENT)
+ztest: dirs generate $(ZTEST)
 
 zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
  $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8)
@@ -127,10 +146,14 @@ iconv:
 !if $(HAVE_LIBXML2)
 LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
 LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
-libxml2: $(BINDIR)\libxml2.dll
+libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib1.dll
 
 $(BINDIR)\libxml2.dll:
-  copy "$(LIBXML2_DIR)\lib\libxml2.dll" $(BINDIR)
+  copy "$(LIBXML2_DIR)\bin\libxml2.dll" $(BINDIR)
+
+$(BINDIR)\zlib1.dll:
+  copy "$(ZLIB_DIR)\bin\zlib1.dll" $(BINDIR)
+
 !else
 LIBXML2_LIB=
 LIBXML2_DEF=/D HAVE_XML2=0
@@ -149,7 +172,6 @@ COMMON_C_OPTIONS=          \
   $(LIBXML2_DEF)           \
   /D "_WINDOWS"            \
   /D "WIN32"               \
-  /D "HAVE_WCHAR_H=1"      \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\" 
@@ -337,6 +359,7 @@ YAZ_UTIL_OBJS= \
 
 YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\diagbib1.obj \
+   $(OBJDIR)\diagsrw.obj \
    $(OBJDIR)\zget.obj \
    $(OBJDIR)\logrpn.obj \
    $(OBJDIR)\pquery.obj \
@@ -613,9 +636,9 @@ $(ITEM_REQ_FILES): $(SRCDIR)\item-req.asn
 	$(TCL) $(TCLOPT) -d ill.tcl item-req.asn
 	@cd $(WINDIR)
 
-$(SRCDIR)\marc8.c: $(SRCDIR)\charconv.sgm
+$(SRCDIR)\marc8.c: $(SRCDIR)\codetables.xml $(SRCDIR)\charconv.tcl
 	@cd $(SRCDIR)
-	$(TCL) charconv.tcl -p marc8 -s 50 charconv.sgm -o marc8.c
+	$(TCL) charconv.tcl -p marc8 codetables.xml -o marc8.c
 
 !endif
 
@@ -661,7 +684,7 @@ $(DLL) $(IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
 		$(DLL_OBJS)
 		$(YAZ_RES)
 		/out:$(DLL) 
-		/implib:"$(LIBDIR)\yaz.lib"
+		/implib:"$(IMPLIB)"
 		/map:"$(LIBDIR)\yaz.map"  
 <<
 
@@ -848,6 +871,7 @@ $(YAZ_MARCDUMP) : "$(BINDIR)" $(YAZ_MARCDUMP_OBJS) $(DLL)
 clean:
 	-del $(BINDIR)\*.exe
 	-del $(BINDIR)\*.dll
+	-del $(BINDIR)\*.pdb
 	-del $(TMPDIR)\*.
 	-del $(LIBDIR)\*.MAP
 	-del $(LIBDIR)\*.LIB