projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mention SRU rather than SRW (where appropriate).
[yaz-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
cc45327
..
cae6a84
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,6
+1,6
@@
# Copyright (C) 1994-2006, Index Data ApS
# All rights reserved.
# Copyright (C) 1994-2006, Index Data ApS
# All rights reserved.
-# $Id: makefile,v 1.105 2006-05-03 13:27:20 adam Exp $
+# $Id: makefile,v 1.111 2006-06-07 14:25:43 adam Exp $
#
# Programmed by
# Heikki Levanto & Adam Dickmeiss
#
# Programmed by
# Heikki Levanto & Adam Dickmeiss
@@
-48,7
+48,6
@@
HHC="c:\program files\html help workshop\hhc.exe"
dist:
nmake DEBUG=1 clean
nmake DEBUG=0 clean
dist:
nmake DEBUG=1 clean
nmake DEBUG=0 clean
- nmake DEBUG=1
nmake DEBUG=0
$(NSIS) yaz.nsi
nmake DEBUG=0
$(NSIS) yaz.nsi
@@
-180,7
+179,10
@@
libxml2:
!if $(HAVE_LIBXSLT)
LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib"
!if $(HAVE_LIBXSLT)
LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib"
-LIBXSLT_DEF=/D HAVE_XSLT=1 /I"$(LIBXSLT_DIR)\include"
+LIBXSLT_DEF= \
+ /D HAVE_XSLTSAVERESULTTOSTRING=1 \
+ /D HAVE_XSLT=1 \
+ /I"$(LIBXSLT_DIR)\include"
libxslt: $(BINDIR)\libxslt.dll
$(BINDIR)\libxslt.dll:
libxslt: $(BINDIR)\libxslt.dll
$(BINDIR)\libxslt.dll:
@@
-190,6
+192,7
@@
$(BINDIR)\libxslt.dll:
LIBXSLT_LIB=
LIBXSLT_DEF=/D HAVE_XSLT=0
libxslt:
LIBXSLT_LIB=
LIBXSLT_DEF=/D HAVE_XSLT=0
libxslt:
+!endif
### C and CPP compiler (the same thing)
### C and CPP compiler (the same thing)
@@
-202,6
+205,7
@@
COMMON_C_OPTIONS= \
$(LIBXML2_DEF) \
$(LIBXSLT_DEF) \
/D "_CRT_SECURE_NO_DEPRECATE" \
$(LIBXML2_DEF) \
$(LIBXSLT_DEF) \
/D "_CRT_SECURE_NO_DEPRECATE" \
+ /D "_CRT_NONSTDC_NO_DEPRECATE" \
/D "_WINDOWS" \
/D "WIN32" \
/FR"$(OBJDIR)\\" \
/D "_WINDOWS" \
/D "WIN32" \
/FR"$(OBJDIR)\\" \
@@
-392,6
+396,9
@@
YAZ_UTIL_OBJS= \
$(OBJDIR)\siconv.obj \
$(OBJDIR)\marc8.obj \
$(OBJDIR)\marc8r.obj \
$(OBJDIR)\siconv.obj \
$(OBJDIR)\marc8.obj \
$(OBJDIR)\marc8r.obj \
+ $(OBJDIR)\record_conv.obj \
+ $(OBJDIR)\retrieval.obj \
+ $(OBJDIR)\libxml2_error.obj \
$(OBJDIR)\test.obj
YAZ_ZUTIL_OBJS= \
$(OBJDIR)\test.obj
YAZ_ZUTIL_OBJS= \
@@
-690,11
+697,11
@@
$(SRCDIR)\marc8r.c: $(SRCDIR)\codetables.xml $(SRCDIR)\charconv.tcl
$(SRCDIR)\diagbib1.c: $(SRCDIR)\bib1.csv
@cd $(SRCDIR)
$(SRCDIR)\diagbib1.c: $(SRCDIR)\bib1.csv
@cd $(SRCDIR)
- $(TCL) csvtobib1.tcl
+ $(TCL) csvtobib1.tcl $(SRCDIR)
$(SRCDIR)\diagsrw.c: $(SRCDIR)\srw.csv
@cd $(SRCDIR)
$(SRCDIR)\diagsrw.c: $(SRCDIR)\srw.csv
@cd $(SRCDIR)
- $(TCL) csvtosrw.tcl
+ $(TCL) csvtosrw.tcl $(SRCDIR)
!endif
!endif