X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=f60ba1fe869ed0826b907c0ba08699933cb5ec4f;hb=cd3f39bbae63668b8806ed205132da166e73102f;hp=815074370353c1f5b4367d7096e988cb833635a7;hpb=bffe75e40b5c2e0668d58e7a30f8e4797578cba0;p=idzebra-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 8150743..f60ba1f 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.17 2002-09-03 12:22:21 adam Exp $
+# $Id: makefile,v 1.25 2003-11-29 16:47:58 adam Exp $
  
 ###########################################################
 ############### Parameters 
@@ -9,11 +9,11 @@ DEBUG=0   # 0 for release, 1 for debug
 
 # EXPAT is optional. It's required for grs.xml-filters.
 HAVE_EXPAT=1
-EXPAT_DIR= c:\Expat-1.95.4
+EXPAT_DIR= c:\Expat-1.95.7
 
 # iconv is optional
-HAVE_ICONV=0
-ICONV_DIR = c:\libiconv-1.7.0.1
+HAVE_ICONV=1
+ICONV_DIR = c:\iconv-1.8.win32
 
 default: all
 
@@ -27,7 +27,7 @@ all: dirs zebralib zserver zindex
 ROOTDIR=..   # The home of zebra
 
 # YAZ include files, libraries, etc.
-YAZDIR=$(ROOTDIR)\..\YAZ
+YAZDIR=$(ROOTDIR)\..\YAZ-2.0.4
 YAZINCL=$(YAZDIR)\include
 YAZLIB=$(YAZDIR)\lib\yaz.lib
 YAZLIBS=$(YAZLIB)
@@ -62,6 +62,7 @@ ISAMBDIR=$(SRCDIR)\ISAMB
 RECCTRLDIR=$(SRCDIR)\RECCTRL
 RSETDIR=$(SRCDIR)\RSET
 UTILDIR=$(SRCDIR)\UTIL
+DATA1DIR=$(SRCDIR)\DATA1
 APITESTDIR=$(SRCDIR)\APITEST
 
 # Force temp files in a local temp, easier to clean
@@ -124,6 +125,7 @@ COMMON_C_OPTIONS=          \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\"         \
+  /DDEFAULT_PROFILE_PATH=0 \
   $(BZIP2DEF)
 
 COMMON_C_INCLUDES= \
@@ -244,10 +246,14 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\lookup.obj \
 	$(OBJDIR)\lookupec.obj \
 	$(OBJDIR)\marcread.obj \
+	$(OBJDIR)\marcomp.obj \
+	$(OBJDIR)\inline.obj \
 	$(OBJDIR)\mfile.obj \
 	$(OBJDIR)\open.obj \
 	$(OBJDIR)\passwddb.obj \
+	$(OBJDIR)\zvrank.obj \
 	$(OBJDIR)\rank1.obj \
+	$(OBJDIR)\livcode.obj \
 	$(OBJDIR)\readfile.obj \
 	$(OBJDIR)\recctrl.obj \
 	$(OBJDIR)\recgrs.obj \
@@ -287,7 +293,26 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\extract.obj \
 	$(OBJDIR)\kinput.obj \
 	$(OBJDIR)\rsisams.obj \
-	$(OBJDIR)\trav.obj
+	$(OBJDIR)\trav.obj \
+	$(OBJDIR)\d1_absyn.obj \
+	$(OBJDIR)\d1_attset.obj \
+	$(OBJDIR)\d1_doespec.obj \
+	$(OBJDIR)\d1_espec.obj \
+	$(OBJDIR)\d1_expout.obj \
+	$(OBJDIR)\d1_grs.obj \
+	$(OBJDIR)\d1_handle.obj \
+	$(OBJDIR)\d1_if.obj \
+	$(OBJDIR)\d1_map.obj \
+	$(OBJDIR)\d1_marc.obj \
+	$(OBJDIR)\d1_prtree.obj \
+	$(OBJDIR)\d1_read.obj \
+	$(OBJDIR)\d1_soif.obj \
+	$(OBJDIR)\d1_sumout.obj \
+	$(OBJDIR)\d1_sutrs.obj \
+	$(OBJDIR)\d1_tagset.obj \
+	$(OBJDIR)\d1_varset.obj \
+	$(OBJDIR)\d1_write.obj \
+	$(OBJDIR)\xpath.obj
 
 ALL_OBJS=\
   $(ZEBRALIB_OBJS) \
@@ -342,6 +367,9 @@ ALL_OBJS=\
 {$(UTILDIR)}.c{$(OBJDIR)}.obj:
 	$(CPP) $(COPT) $< 
 
+{$(DATA1DIR)}.c{$(OBJDIR)}.obj:
+	$(CPP) $(COPT) $< 
+
 {$(APITESTDIR)}.c{$(OBJDIR)}.obj:
 	$(CPP) $(COPT) $<