Updated WIN32 makefile for new source

[idzebra-moved-to-github.git] / win / makefile

diff --git a/win/makefile b/win/makefile
index e2d7192..7c23d63 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
-# Z'mbol/Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.14 2002-08-05 20:05:07 adam Exp $
+# Zebra makefile for MS NMAKE
+# $Id: makefile,v 1.22 2003-02-28 14:34:21 adam Exp $
  
 ###########################################################
 ############### Parameters 
@@ -7,9 +7,13 @@
 
 DEBUG=0   # 0 for release, 1 for debug
 
-# iconv
-HAVE_ICONV=0
-ICONV_DIR = c:\libiconv-1.7.0.1
+# EXPAT is optional. It's required for grs.xml-filters.
+HAVE_EXPAT=1
+EXPAT_DIR= c:\Expat-1.95.4
+
+# iconv is optional
+HAVE_ICONV=1
+ICONV_DIR = c:\iconv-1.8.win32
 
 default: all
 
@@ -20,7 +24,7 @@ all: dirs zebralib zserver zindex
 ###########################################################
 # The current directory is supposed to be something like
 # ..../Zebra/Win, everything is relative to that
-ROOTDIR=..   # The home of Z'mbol
+ROOTDIR=..   # The home of zebra
 
 # YAZ include files, libraries, etc.
 YAZDIR=$(ROOTDIR)\..\YAZ
@@ -28,7 +32,8 @@ YAZINCL=$(YAZDIR)\include
 YAZLIB=$(YAZDIR)\lib\yaz.lib
 YAZLIBS=$(YAZLIB)
 YAZBINDIR=$(YAZDIR)\bin
-YAZDLL=$(YAZBINDIR)\yaz.dll
+YAZ_DLL_SOURCE=$(YAZBINDIR)\yaz.dll
+YAZ_DLL_TARGET=$(BINDIR)\yaz.dll
 
 # BZIP2 settings. Uncomment and specify if you wish to use LIBBZIP2.
 # (C) 1996-1999 Julian Seward <jseward@acm.org> http://www.bzip2.org
@@ -57,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
@@ -84,15 +90,25 @@ apitest: $(APITEST)
 ############### Compiler and linker options 
 ###########################################################
 
+!if $(HAVE_EXPAT)
+EXPAT_DEF= /D HAVE_EXPAT_H=1 /I"$(EXPAT_DIR)\source\lib"
+EXPAT_LIB= "$(EXPAT_DIR)\libs\libexpat.lib"
+EXPAT_DLL_SOURCE= "$(EXPAT_DIR)\libs\libexpat.dll"
+EXPAT_DLL_TARGET="$(BINDIR)\libexpat.dll"
+$(EXPAT_DLL_TARGET) : $(EXPAT_DLL_SOURCE)
+       copy $(EXPAT_DLL_SOURCE) $(EXPAT_DLL_TARGET)
+!else
+EXPAT_DEF= /D HAVE_EXPAT_H=0
+EXPAT_LIB=
+EXPAT_DLL_SOURCE=
+EXPAT_DLL_TARGET=
+!endif
+
 !if $(HAVE_ICONV)
-ICONV_DEF= \
-  /D HAVE_ICONV_H=1 \
-  /I"$(ICONV_DIR)\include"
-ICONV_LIB= \
-  $(ICONV_DIR)\lib\iconv.lib
+ICONV_DEF= /D HAVE_ICONV_H=1 /I"$(ICONV_DIR)\include"
+ICONV_LIB= $(ICONV_DIR)\lib\iconv.lib
 !else
-ICONV_DEF= \
-  /D HAVE_ICONV_H=0
+ICONV_DEF= /D HAVE_ICONV_H=0
 ICONV_LIB=
 !endif
 
@@ -105,9 +121,11 @@ COMMON_C_OPTIONS=          \
   /D "WIN32"               \
   /D"_CONSOLE" /D"_MBCS"   \
   $(ICONV_DEF)             \
+  $(EXPAT_DEF)             \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\"         \
+  /DDEFAULT_PROFILE_PATH=0 \
   $(BZIP2DEF)
 
 COMMON_C_INCLUDES= \
@@ -145,7 +163,7 @@ LINK=link.exe
 LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   winspool.lib \
            comdlg32.lib advapi32.lib shell32.lib ole32.lib    \
            oleaut32.lib uuid.lib     odbc32.lib  odbccp32.lib \
-           wsock32.lib  advapi32.lib $(ICONV_LIB)
+           wsock32.lib  advapi32.lib $(ICONV_LIB) $(EXPAT_LIB)
 
 COMMON_LNK_OPTIONS= /nologo \
                     /machine:i386 \
@@ -228,9 +246,12 @@ 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)\readfile.obj \
        $(OBJDIR)\recctrl.obj \
@@ -239,6 +260,7 @@ ZEBRALIB_OBJS= \
        $(OBJDIR)\recstat.obj \
        $(OBJDIR)\rectext.obj \
        $(OBJDIR)\regxread.obj \
+       $(OBJDIR)\xmlread.obj \
        $(OBJDIR)\res.obj \
        $(OBJDIR)\retrieve.obj \
        $(OBJDIR)\rsbool.obj \
@@ -270,7 +292,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) \
@@ -325,6 +366,9 @@ ALL_OBJS=\
 {$(UTILDIR)}.c{$(OBJDIR)}.obj:
        $(CPP) $(COPT) $< 
 
+{$(DATA1DIR)}.c{$(OBJDIR)}.obj:
+       $(CPP) $(COPT) $< 
+
 {$(APITESTDIR)}.c{$(OBJDIR)}.obj:
        $(CPP) $(COPT) $< 
 
@@ -387,15 +431,20 @@ clean:
        -del $(OBJDIR)\*.obj
        -del $(OBJDIR)\*.sbr
        -del $(BINDIR)\*.exe
+       -del $(BINDIR)\*.dll
        -del $(TMPDIR)\*.
        -del $(LIBDIR)\*.lib
 
 ########### check directories and create if needed
-dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR)
+dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR) \
+       $(EXPAT_DLL_TARGET) $(YAZ_DLL_TARGET)
 
 $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
        if not exist "$@/$(NUL)" mkdir "$@"
 
+$(YAZ_DLL_TARGET) : $(YAZ_DLL_SOURCE)
+       copy $(YAZ_DLL_SOURCE) $(YAZ_DLL_TARGET)
+
 ###########################################################
 ############### Explicit dependencies
 ###########################################################