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
section on relation attributes added
[idzebra-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
b05dc8f
..
4156dd0
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.48 2006-05-30 13:21:21 adam Exp $
+# $Id: makefile,v 1.52 2006-06-13 20:09:54 adam Exp $
###########################################################
############### Parameters
###########################################################
############### Parameters
@@
-15,7
+15,7
@@
EXPAT_DIR=c:\Expat-1.95.8
HAVE_ICONV=1
ICONV_DIR=c:\iconv-1.9.1.win32
HAVE_ICONV=1
ICONV_DIR=c:\iconv-1.9.1.win32
-# libxslt. For xslt+alvis
+# libxslt. For alvis
HAVE_LIBXSLT=1
LIBXSLT_DIR=c:\libxslt-1.1.14.win32
HAVE_LIBXSLT=1
LIBXSLT_DIR=c:\libxslt-1.1.14.win32
@@
-202,13
+202,9
@@
libxslt:
!if $(HAVE_LIBXSLT)
MOD_ALVIS_OBJS= $(OBJDIR)\alvis.obj
MOD_ALVIS_CFLAGS=/DIDZEBRA_STATIC_ALVIS=1
!if $(HAVE_LIBXSLT)
MOD_ALVIS_OBJS= $(OBJDIR)\alvis.obj
MOD_ALVIS_CFLAGS=/DIDZEBRA_STATIC_ALVIS=1
-MOD_XSLT_OBJS= $(OBJDIR)\xslt.obj
-MOD_XSLT_CFLAGS=/DIDZEBRA_STATIC_XSLT=1
!else
MOD_ALVIS_OBJS=
MOD_ALVIS_CFLAGS=
!else
MOD_ALVIS_OBJS=
MOD_ALVIS_CFLAGS=
-MOD_XSLT_OBJS=
-MOD_XSLT_CFLAGS=
!endif
### C and CPP compiler (the same thing)
!endif
### C and CPP compiler (the same thing)
@@
-221,6
+217,7
@@
COMMON_C_OPTIONS= \
/D"_CONSOLE" /D"_MBCS" \
/DYAZ_USE_NEW_LOG=1 \
/D"_CRT_SECURE_NO_DEPRECATE" \
/D"_CONSOLE" /D"_MBCS" \
/DYAZ_USE_NEW_LOG=1 \
/D"_CRT_SECURE_NO_DEPRECATE" \
+ /D"_CRT_NONSTDC_NO_DEPRECATE" \
$(ICONV_DEF) \
$(EXPAT_DEF) \
$(LIBXML2_DEF) \
$(ICONV_DEF) \
$(EXPAT_DEF) \
$(LIBXML2_DEF) \
@@
-237,7
+234,6
@@
COMMON_C_OPTIONS= \
/DIDZEBRA_STATIC_GRS_MARC=1 \
/DIDZEBRA_STATIC_GRS_DANBIB=1 \
$(MOD_ALVIS_CFLAGS) \
/DIDZEBRA_STATIC_GRS_MARC=1 \
/DIDZEBRA_STATIC_GRS_DANBIB=1 \
$(MOD_ALVIS_CFLAGS) \
- $(MOD_XSLT_CFLAGS) \
/DIDZEBRA_STATIC_SAFARI=1 \
$(BZIP2DEF)
/DIDZEBRA_STATIC_SAFARI=1 \
$(BZIP2DEF)
@@
-327,7
+323,6
@@
TSTFLOCK_OBJS= \
ZEBRALIB_OBJS= \
$(MOD_ALVIS_OBJS) \
ZEBRALIB_OBJS= \
$(MOD_ALVIS_OBJS) \
- $(MOD_XSLT_OBJS) \
$(OBJDIR)\atoi_zn.obj \
$(OBJDIR)\attribute.obj \
$(OBJDIR)\attrfind.obj \
$(OBJDIR)\atoi_zn.obj \
$(OBJDIR)\attribute.obj \
$(OBJDIR)\attrfind.obj \
@@
-356,7
+351,6
@@
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)\danbibr.obj \
$(OBJDIR)\dclose.obj \
$(OBJDIR)\dcompact.obj \
$(OBJDIR)\delete.obj \
$(OBJDIR)\dclose.obj \
$(OBJDIR)\dcompact.obj \
$(OBJDIR)\delete.obj \
@@
-430,8
+424,7
@@
ZEBRALIB_OBJS= \
$(OBJDIR)\zinfo.obj \
$(OBJDIR)\zint.obj \
$(OBJDIR)\zrpn.obj \
$(OBJDIR)\zinfo.obj \
$(OBJDIR)\zint.obj \
$(OBJDIR)\zrpn.obj \
- $(OBJDIR)\zsets.obj \
- $(OBJDIR)\zvrank.obj
+ $(OBJDIR)\zsets.obj
ALL_OBJS=\
$(ZEBRALIB_OBJS) \
ALL_OBJS=\
$(ZEBRALIB_OBJS) \
@@
-582,6
+575,7
@@
$(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
yaz: $(YAZ_DLL_TARGET)
$(YAZ_DLL_TARGET) : $(YAZ_DLL_SOURCE)
yaz: $(YAZ_DLL_TARGET)
$(YAZ_DLL_TARGET) : $(YAZ_DLL_SOURCE)
+ copy $(YAZBINDIR)\*.dll.manifest $(BINDIR)
copy $(YAZBINDIR)\*.dll $(BINDIR)
###########################################################
copy $(YAZBINDIR)\*.dll $(BINDIR)
###########################################################