X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=2f79a7250fca2b95d2ad895f1fc69ea7e68b4669;hp=a65e64ed839b8b3b5dd3ef5178b5a3c56c09f006;hb=a02be6c13a7353e7b2fba65a1faab1c6819d1728;hpb=28d1d00131b5e63828cf638ee1b971a348cd0d6d

diff --git a/win/makefile b/win/makefile
index a65e64e..2f79a72 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,4 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.73 2008-01-17 14:01:45 adam Exp $
  
 ###########################################################
 ############### Parameters 
@@ -7,6 +6,10 @@
 
 DEBUG=0   # 0 for release, 1 for debug
 
+# TCL is optional - ONLY needed for source straight from Git
+TCL="C:\Tcl\bin\tclsh85.exe"
+HAVE_TCL=1
+
 # EXPAT is optional. It's required for grs.xml-filters.
 HAVE_EXPAT=1
 EXPAT_DIR=c:\Program files\Expat 2.0.1
@@ -15,13 +18,13 @@ EXPAT_DIR=c:\Program files\Expat 2.0.1
 HAVE_ICONV=1
 ICONV_DIR=c:\iconv-1.9.2.win32
 
-# libxslt. For alvis
+# libxslt. For mod_dom and mod_alvis
 HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.19.win32
+LIBXSLT_DIR=c:\libxslt-1.1.24.win32
 
 # libxml2. Used by libxslt
 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
@@ -31,12 +34,12 @@ ZLIB_DIR = c:\zlib-1.2.3.win32
 
 # ICU support
 # get icu libraries from http://www.icu-project.org
-HAVE_LIBICU=1
+HAVE_ICU=1
 ICU_DIR=c:\icu
 
 
 default: all
-all: dirs expat iconv libxml2 libxslt icu yaz dll zserver zebraidx tstflock
+all: dirs generate expat iconv libxml2 libxslt icu yaz dll zserver zebraidx tstflock
 
 # Directories
 # The current directory is supposed to be something like
@@ -46,18 +49,17 @@ ROOTDIR=..   # The home of zebra
 # YAZ include files, libraries, etc.
 YAZDIR=$(ROOTDIR)\..\yaz  # or \program files\yaz
 
-YAZINCL=$(YAZDIR)\include
 YAZBINDIR=$(YAZDIR)\bin
 !if $(DEBUG)
 YAZLIB="$(YAZDIR)\lib\yaz3d.lib"
-!if $(HAVE_LIBICU)
+!if $(HAVE_ICU)
 YAZLIB=$(YAZLIB) "$(YAZDIR)\lib\yaz_icu3d.lib"
 !endif
 YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3d.dll"
 YAZ_DLL_TARGET="$(BINDIR)\yaz3d.dll"
 !else
 YAZLIB="$(YAZDIR)\lib\yaz3.lib"
-!if $(HAVE_LIBICU)
+!if $(HAVE_ICU)
 YAZLIB=$(YAZLIB) "$(YAZDIR)\lib\yaz_icu3.lib"
 !endif
 YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3.dll"
@@ -123,8 +125,6 @@ DLL=$(BINDIR)\idzebra.dll
 IMPLIB=$(LIBDIR)\idzebra.lib
 !endif
 
-ZEBRA_RES=$(OBJDIR)\idzebra.res
-
 ZSERVER=$(BINDIR)\zebrasrv.exe
 ZEBRAIDX=$(BINDIR)\zebraidx.exe
 TSTFLOCK=$(BINDIR)\tstflock.exe
@@ -200,17 +200,17 @@ libxslt:
 
 !endif
 
-!if $(HAVE_LIBICU)
+!if $(HAVE_ICU)
 ICU_DEF= /DYAZ_HAVE_ICU=1  /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
-
-$(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)
+icu: $(BINDIR)\icudt40.dll $(BINDIR)\icuin40.dll $(BINDIR)\icuuc40.dll
+
+$(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=  /DYAZ_HAVE_ICU=0
 ICU_LIB=
@@ -218,7 +218,7 @@ icu:
 !endif
 
 !if $(HAVE_LIBXSLT)
-MOD_ALVIS_OBJS= $(OBJDIR)\alvis.obj
+MOD_ALVIS_OBJS= $(OBJDIR)\mod_alvis.obj
 MOD_ALVIS_CFLAGS=/DIDZEBRA_STATIC_ALVIS=1
 
 MOD_DOM_OBJS= $(OBJDIR)\mod_dom.obj
@@ -335,6 +335,14 @@ LINK_PROGRAM= $(LINK) \
 		$(BZIP2LIB) \
 		$(LINK_LIBS)
 
+
+# Generated sources
+generate: $(INCLDIR)\idzebra\version.h
+
+$(INCLDIR)\idzebra\version.h:
+	@cd $(ROOTDIR)\util
+	$(TCL) mk_version.tcl $(ROOTDIR)/configure.ac $(INCLDIR)\idzebra\version.h
+
 # Source and object modules
 # Note: Ordinary source files are not specified here at 
 # all, make finds them in suitable dirs. The object modules
@@ -410,7 +418,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\lookup.obj \
 	$(OBJDIR)\lookupec.obj \
 	$(OBJDIR)\marcomp.obj \
-	$(OBJDIR)\marcread.obj \
+	$(OBJDIR)\mod_grs_marc.obj \
 	$(OBJDIR)\merge.obj \
 	$(OBJDIR)\mfile.obj \
 	$(OBJDIR)\open.obj \
@@ -424,8 +432,8 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\records.obj \
 	$(OBJDIR)\recindex.obj \
 	$(OBJDIR)\reckeys.obj \
-	$(OBJDIR)\rectext.obj \
-	$(OBJDIR)\regxread.obj \
+	$(OBJDIR)\mod_text.obj \
+	$(OBJDIR)\mod_grs_regx.obj \
 	$(OBJDIR)\res.obj \
 	$(OBJDIR)\retrieve.obj \
 	$(OBJDIR)\rpnscan.obj \
@@ -441,10 +449,10 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\rsnull.obj \
 	$(OBJDIR)\rsprox.obj \
 	$(OBJDIR)\rstemp.obj \
-	$(OBJDIR)\safari.obj \
+	$(OBJDIR)\mod_safari.obj \
 	$(OBJDIR)\scan.obj \
 	$(OBJDIR)\set.obj \
-	$(OBJDIR)\sgmlread.obj \
+	$(OBJDIR)\mod_grs_sgml.obj \
 	$(OBJDIR)\snippet.obj \
 	$(OBJDIR)\sortidx.obj \
 	$(OBJDIR)\states.obj \
@@ -456,7 +464,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\update_path.obj \
 	$(OBJDIR)\update_file.obj \
 	$(OBJDIR)\version.obj \
-	$(OBJDIR)\xmlread.obj \
+	$(OBJDIR)\mod_grs_xml.obj \
 	$(OBJDIR)\xpath.obj \
 	$(OBJDIR)\zaptterm.obj \
 	$(OBJDIR)\zebra-lock.obj \
@@ -517,12 +525,28 @@ $(TSTFLOCK) : "$(BINDIR)" $(TSTFLOCK_OBJS) $(IMPLIB)
 		$(TSTFLOCK_OBJS) \
 		/out:$(TSTFLOCK) 
 
-$(DLL) $(IMPLIB): "$(BINDIR)" $(ZEBRALIB_OBJS)
+# Resources
+RES=$(OBJDIR)\zebra.res
+RC=$(WINDIR)\zebra.rc
+
+RSC=rc.exe
+!if $(DEBUG)
+RSOPT=/d_DEBUG
+!else
+RSOPT=/d_NDEBUG
+!endif
+
+
+$(RES): $(RC)
+	$(RSC) $(RSOPT) /I"../include" /I"$(YAZDIR)\include" /fo"$(RES)" $(RC)
+
+$(DLL) $(IMPLIB): "$(BINDIR)" $(ZEBRALIB_OBJS) $(RES)
 	$(LINK) \
 		$(LNKOPT) \
 		$(LINK_LIBS) \
 		$(DLL_LINK_OPTIONS) \
 		$(ZEBRALIB_OBJS) \
+		$(RES) \
 		/out:$(DLL) \
 		$(YAZLIB) \
 		/implib:"$(IMPLIB)" \