projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added support for term references (queryIDs) for searchResult.
[idzebra-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
99d2bfe
..
71f96e7
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,5
+1,5
@@
# Zebra makefile for MS NMAKE
# Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.31 2005-01-15 13:18:17 adam Exp $
+# $Id: makefile,v 1.35 2005-05-13 09:41:59 adam Exp $
###########################################################
############### Parameters
###########################################################
############### Parameters
@@
-9,15
+9,15
@@
DEBUG=0 # 0 for release, 1 for debug
# EXPAT is optional. It's required for grs.xml-filters.
HAVE_EXPAT=1
# EXPAT is optional. It's required for grs.xml-filters.
HAVE_EXPAT=1
-EXPAT_DIR= c:\Expat-1.95.7
+EXPAT_DIR=c:\Expat-1.95.8
# iconv is optional
HAVE_ICONV=1
# iconv is optional
HAVE_ICONV=1
-ICONV_DIR = c:\iconv-1.9.1.win32
+ICONV_DIR=c:\iconv-1.9.1.win32
default: all
default: all
-all: dirs zebralib zserver zindex
+all: dirs iconv zebralib zserver zindex
###########################################################
############### Directories
###########################################################
############### Directories
@@
-119,9
+119,14
@@
EXPAT_DLL_TARGET=
!if $(HAVE_ICONV)
ICONV_DEF= /D HAVE_ICONV_H=1 /I"$(ICONV_DIR)\include"
ICONV_LIB= $(ICONV_DIR)\lib\iconv.lib
!if $(HAVE_ICONV)
ICONV_DEF= /D HAVE_ICONV_H=1 /I"$(ICONV_DIR)\include"
ICONV_LIB= $(ICONV_DIR)\lib\iconv.lib
+iconv: $(BINDIR)\iconv.dll
+
+$(BINDIR)\iconv.dll:
+ copy "$(ICONV_DIR)\lib\iconv.dll" $(BINDIR)
!else
ICONV_DEF= /D HAVE_ICONV_H=0
ICONV_LIB=
!else
ICONV_DEF= /D HAVE_ICONV_H=0
ICONV_LIB=
+iconv:
!endif
### C and CPP compiler (the same thing)
!endif
### C and CPP compiler (the same thing)
@@
-287,6
+292,7
@@
ZEBRALIB_OBJS= \
$(OBJDIR)\trunc.obj \
$(OBJDIR)\zebraapi.obj \
$(OBJDIR)\zebramap.obj \
$(OBJDIR)\trunc.obj \
$(OBJDIR)\zebraapi.obj \
$(OBJDIR)\zebramap.obj \
+ $(OBJDIR)\zint.obj \
$(OBJDIR)\zinfo.obj \
$(OBJDIR)\zrpn.obj \
$(OBJDIR)\zsets.obj \
$(OBJDIR)\zinfo.obj \
$(OBJDIR)\zrpn.obj \
$(OBJDIR)\zsets.obj \
@@
-319,7
+325,9
@@
ZEBRALIB_OBJS= \
$(OBJDIR)\d1_tagset.obj \
$(OBJDIR)\d1_varset.obj \
$(OBJDIR)\d1_write.obj \
$(OBJDIR)\d1_tagset.obj \
$(OBJDIR)\d1_varset.obj \
$(OBJDIR)\d1_write.obj \
- $(OBJDIR)\xpath.obj
+ $(OBJDIR)\xpath.obj \
+ $(OBJDIR)\kcontrol.obj \
+ $(OBJDIR)\limit.obj
ALL_OBJS=\
$(ZEBRALIB_OBJS) \
ALL_OBJS=\
$(ZEBRALIB_OBJS) \
@@
-450,7
+458,7
@@
$(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
if not exist "$@/$(NUL)" mkdir "$@"
$(YAZ_DLL_TARGET) : $(YAZ_DLL_SOURCE)
if not exist "$@/$(NUL)" mkdir "$@"
$(YAZ_DLL_TARGET) : $(YAZ_DLL_SOURCE)
- copy $(YAZ_DLL_SOURCE) $(YAZ_DLL_TARGET)
+ copy $(YAZBINDIR)\*.dll $(BINDIR)
###########################################################
############### Explicit dependencies
###########################################################
############### Explicit dependencies