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
Several updates for the changes of hit count datatype from int
[idzebra-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
99d2bfe
..
382212d
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.33 2005-01-16 00:27:54 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)
@@
-450,7
+455,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