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
NSIS: add configure.ac
[yaz-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
206dfda
..
517ee0a
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,5
+1,5
@@
# This file is part of the YAZ toolkit.
# This file is part of the YAZ toolkit.
-# Copyright (C) 1995-2010 Index Data
+# Copyright (C) 1995-2011 Index Data
# Parameters
# Parameters
@@
-45,14
+45,23
@@
all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog testprog icon
NSIS="c:\program files\nsis\makensis.exe"
HHC="c:\program files\html help workshop\hhc.exe"
NSIS="c:\program files\nsis\makensis.exe"
HHC="c:\program files\html help workshop\hhc.exe"
-dist: yaz.nsi
+dist: yaz.win32.nsi yaz.nsi distclean
+ nmake DEBUG=0
+ $(NSIS) yaz.win32.nsi
+
+dist64: yaz.win64.nsi yaz.nsi distclean
+ nmake DEBUG=0 HAVE_LIBXSLT=0 HAVE_LIBXML2=0 HAVE_ICONV=0 HAVE_ICU=0
+ $(NSIS) yaz.win64.nsi
+
+distclean:
nmake DEBUG=1 clean
nmake DEBUG=0 clean
nmake DEBUG=1 clean
nmake DEBUG=0 clean
- nmake DEBUG=0
- $(NSIS) yaz.nsi
-nsis: all yaz.nsi
- $(NSIS) yaz.nsi
+nsis: all yaz32.nsi
+ $(NSIS) yaz.win32.nsi
+
+nsis64: yaz.win64.nsi
+ $(NSIS) yaz.win64.nsi
nsishelp:
$(NSIS)
nsishelp:
$(NSIS)
@@
-248,7
+257,8
@@
COMMON_C_OPTIONS= \
/Fd"$(OBJDIR)\\"
COMMON_C_INCLUDES= \
/Fd"$(OBJDIR)\\"
COMMON_C_INCLUDES= \
- /I"$(ROOTDIR)\include"
+ /I"$(ROOTDIR)\include" \
+ /I"$(ROOTDIR)\libstemmer_c\include"
DEBUG_C_OPTIONS= \
/D "_DEBUG" \
DEBUG_C_OPTIONS= \
/D "_DEBUG" \
@@
-470,6
+480,8
@@
MISC_OBJS= \
$(OBJDIR)\opacdisp.obj \
$(OBJDIR)\zgdu.obj \
$(OBJDIR)\soap.obj \
$(OBJDIR)\opacdisp.obj \
$(OBJDIR)\zgdu.obj \
$(OBJDIR)\soap.obj \
+ $(OBJDIR)\solr.obj \
+ $(OBJDIR)\solrtransform.obj \
$(OBJDIR)\srw.obj \
$(OBJDIR)\srwutil.obj \
$(OBJDIR)\zoom-c.obj \
$(OBJDIR)\srw.obj \
$(OBJDIR)\srwutil.obj \
$(OBJDIR)\zoom-c.obj \
@@
-478,7
+490,7
@@
MISC_OBJS= \
$(OBJDIR)\zoom-z3950.obj \
$(OBJDIR)\zoom-sru.obj \
$(OBJDIR)\zoom-query.obj \
$(OBJDIR)\zoom-z3950.obj \
$(OBJDIR)\zoom-sru.obj \
$(OBJDIR)\zoom-query.obj \
- $(OBJDIR)\record-render.obj \
+ $(OBJDIR)\record_render.obj \
$(OBJDIR)\facet.obj \
$(OBJDIR)\zoom-opt.obj \
$(OBJDIR)\zoom-socket.obj \
$(OBJDIR)\facet.obj \
$(OBJDIR)\zoom-opt.obj \
$(OBJDIR)\zoom-socket.obj \
@@
-493,6
+505,7
@@
MISC_OBJS= \
$(OBJDIR)\cqlutil.obj \
$(OBJDIR)\cqlstrer.obj \
$(OBJDIR)\rpn2cql.obj \
$(OBJDIR)\cqlutil.obj \
$(OBJDIR)\cqlstrer.obj \
$(OBJDIR)\rpn2cql.obj \
+ $(OBJDIR)\rpn2solr.obj \
$(OBJDIR)\xcqlutil.obj \
$(OBJDIR)\elementset.obj \
$(OBJDIR)\timing.obj \
$(OBJDIR)\xcqlutil.obj \
$(OBJDIR)\elementset.obj \
$(OBJDIR)\timing.obj \
@@
-559,10
+572,17
@@
ILL_OBJS= \
$(OBJDIR)\ill-core.obj\
$(OBJDIR)\item-req.obj
$(OBJDIR)\ill-core.obj\
$(OBJDIR)\item-req.obj
+STEMMER_OBJS = \
+ $(OBJDIR)\libstemmer.obj \
+ $(OBJDIR)\api.obj \
+ $(OBJDIR)\utilities.obj \
+ $(OBJDIR)\stem_UTF_8_porter.obj \
+ $(OBJDIR)\stem_UTF_8_english.obj
+
DLL_OBJS =\
$(MISC_OBJS) \
$(Z3950_OBJS) \
DLL_OBJS =\
$(MISC_OBJS) \
$(Z3950_OBJS) \
- $(ILL_OBJS) \
+ $(ILL_OBJS)
ICU_DLL_OBJS =\
$(OBJDIR)\icu_chain.obj \
ICU_DLL_OBJS =\
$(OBJDIR)\icu_chain.obj \
@@
-571,7
+591,9
@@
ICU_DLL_OBJS =\
$(OBJDIR)\icu_transform.obj \
$(OBJDIR)\icu_casemap.obj \
$(OBJDIR)\icu_tokenizer.obj \
$(OBJDIR)\icu_transform.obj \
$(OBJDIR)\icu_casemap.obj \
$(OBJDIR)\icu_tokenizer.obj \
- $(OBJDIR)\icu_sortkey.obj
+ $(OBJDIR)\icu_sortkey.obj \
+ $(OBJDIR)\stemmer.obj \
+ $(STEMMER_OBJS)
# Generated C and H files
# Generated C and H files
@@
-731,6
+753,15
@@
generate: \
{$(TESTDIR)}.c{$(OBJDIR)}.obj:
$(CPP) $(COPT) $<
{$(TESTDIR)}.c{$(OBJDIR)}.obj:
$(CPP) $(COPT) $<
+{$(ROOTDIR)\libstemmer_c\libstemmer}.c{$(OBJDIR)}.obj:
+ $(CPP) $(COPT) $<
+
+{$(ROOTDIR)\libstemmer_c\runtime}.c{$(OBJDIR)}.obj:
+ $(CPP) $(COPT) $<
+
+{$(ROOTDIR)\libstemmer_c\src_c}.c{$(OBJDIR)}.obj:
+ $(CPP) $(COPT) $<
+
# ASN-generated files
!if $(HAVE_TCL)
# ASN-generated files
!if $(HAVE_TCL)