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

diff --git a/win/makefile b/win/makefile
index a65e64e..40cb077 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.73 2008-01-17 14:01:45 adam Exp $
+# $Id: makefile,v 1.75 2008-01-18 11:33:36 adam Exp $
  
 ###########################################################
 ############### Parameters 
@@ -15,7 +15,7 @@ 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
 
@@ -31,7 +31,7 @@ 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
 
 
@@ -46,18 +46,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 +122,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,7 +197,7 @@ 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
@@ -218,7 +215,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
@@ -410,7 +407,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 +421,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 +438,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 +453,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 +514,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)" \