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
Started work on using GNU TLS as an alterantive to OpenSSL.
[yaz-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
31527f9
..
b170a1d
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,6
+1,5
@@
-# Copyright (C) 1995-2008, Index Data ApS
-# All rights reserved.
-# $Id: makefile,v 1.144 2008-01-18 11:47:56 adam Exp $
+# This file is part of the YAZ toolkit.
+# Copyright (C) 1995-2008 Index Data
#
# Programmed by
# Heikki Levanto & Adam Dickmeiss
#
# Programmed by
# Heikki Levanto & Adam Dickmeiss
@@
-44,7
+43,7
@@
BISON=bison
default: all
default: all
-all: dirs generate dll client ztest yazicu zoomsh utilprog testprog iconv icu libxml2 libxslt
+all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog testprog iconv icu libxml2 libxslt
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"
@@
-109,6
+108,7
@@
CLIENT=$(BINDIR)\yaz-client.exe
YAZ_ICU=$(BINDIR)\yaz-icu.exe
ZOOMSH=$(BINDIR)\zoomsh.exe
ZTEST=$(BINDIR)\yaz-ztest.exe
YAZ_ICU=$(BINDIR)\yaz-icu.exe
ZOOMSH=$(BINDIR)\zoomsh.exe
ZTEST=$(BINDIR)\yaz-ztest.exe
+SC_TEST=$(BINDIR)\sc_test.exe
ZOOMTST1=$(BINDIR)\zoomtst1.exe
ZOOMTST2=$(BINDIR)\zoomtst2.exe
ZOOMTST1=$(BINDIR)\zoomtst1.exe
ZOOMTST2=$(BINDIR)\zoomtst2.exe
@@
-133,6
+133,8
@@
dll: dirs generate $(YAZ_DLL)
client: dirs generate $(CLIENT)
ztest: dirs generate $(ZTEST)
client: dirs generate $(CLIENT)
ztest: dirs generate $(ZTEST)
+sc_test: $(SC_TEST)
+
zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
$(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8) $(ZOOMTST9) \
$(ZOOMTST10)
zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
$(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8) $(ZOOMTST9) \
$(ZOOMTST10)
@@
-328,10
+330,14
@@
YAZ_CLIENT_OBJS= \
YAZ_ICU_OBJS= $(OBJDIR)\yaz-icu.obj
ZTEST_OBJS= \
YAZ_ICU_OBJS= $(OBJDIR)\yaz-icu.obj
ZTEST_OBJS= \
+ $(OBJDIR)\dummy-opac.obj \
$(OBJDIR)\read-marc.obj \
$(OBJDIR)\read-grs.obj \
$(OBJDIR)\ztest.obj
$(OBJDIR)\read-marc.obj \
$(OBJDIR)\read-grs.obj \
$(OBJDIR)\ztest.obj
+SC_TEST_OBJS = \
+ $(OBJDIR)\sc_test.obj
+
YAZ_ZOOMSH_OBJS = \
$(OBJDIR)\zoomsh.obj
YAZ_ZOOMSH_OBJS = \
$(OBJDIR)\zoomsh.obj
@@
-375,7
+381,6
@@
MISC_OBJS= \
$(OBJDIR)\oid_std.obj \
$(OBJDIR)\eventl.obj \
$(OBJDIR)\requestq.obj \
$(OBJDIR)\oid_std.obj \
$(OBJDIR)\eventl.obj \
$(OBJDIR)\requestq.obj \
- $(OBJDIR)\service.obj \
$(OBJDIR)\seshigh.obj \
$(OBJDIR)\statserv.obj \
$(OBJDIR)\tcpdchk.obj \
$(OBJDIR)\seshigh.obj \
$(OBJDIR)\statserv.obj \
$(OBJDIR)\tcpdchk.obj \
@@
-433,6
+438,10
@@
MISC_OBJS= \
$(OBJDIR)\xmalloc.obj \
$(OBJDIR)\matchstr.obj \
$(OBJDIR)\siconv.obj \
$(OBJDIR)\xmalloc.obj \
$(OBJDIR)\matchstr.obj \
$(OBJDIR)\siconv.obj \
+ $(OBJDIR)\iso5428.obj \
+ $(OBJDIR)\utf8.obj \
+ $(OBJDIR)\ucs4.obj \
+ $(OBJDIR)\advancegreek.obj \
$(OBJDIR)\snprintf.obj \
$(OBJDIR)\marc8.obj \
$(OBJDIR)\marc8r.obj \
$(OBJDIR)\snprintf.obj \
$(OBJDIR)\marc8.obj \
$(OBJDIR)\marc8r.obj \
@@
-463,6
+472,7
@@
MISC_OBJS= \
$(OBJDIR)\zoom-socket.obj \
$(OBJDIR)\initopt.obj \
$(OBJDIR)\xmlquery.obj \
$(OBJDIR)\zoom-socket.obj \
$(OBJDIR)\initopt.obj \
$(OBJDIR)\xmlquery.obj \
+ $(OBJDIR)\xmlerror.obj \
$(OBJDIR)\mime.obj \
$(OBJDIR)\cql.obj \
$(OBJDIR)\cqlstdio.obj \
$(OBJDIR)\mime.obj \
$(OBJDIR)\cql.obj \
$(OBJDIR)\cqlstdio.obj \
@@
-470,6
+480,7
@@
MISC_OBJS= \
$(OBJDIR)\cqltransform.obj \
$(OBJDIR)\cqlutil.obj \
$(OBJDIR)\cqlstrer.obj \
$(OBJDIR)\cqltransform.obj \
$(OBJDIR)\cqlutil.obj \
$(OBJDIR)\cqlstrer.obj \
+ $(OBJDIR)\rpn2cql.obj \
$(OBJDIR)\xcqlutil.obj \
$(OBJDIR)\elementset.obj \
$(OBJDIR)\timing.obj \
$(OBJDIR)\xcqlutil.obj \
$(OBJDIR)\elementset.obj \
$(OBJDIR)\timing.obj \
@@
-479,6
+490,12
@@
MISC_OBJS= \
$(OBJDIR)\http.obj \
$(OBJDIR)\match_glob.obj \
$(OBJDIR)\poll.obj \
$(OBJDIR)\http.obj \
$(OBJDIR)\match_glob.obj \
$(OBJDIR)\poll.obj \
+ $(OBJDIR)\daemon.obj \
+ $(OBJDIR)\iconv_encode_iso_8859_1.obj \
+ $(OBJDIR)\iconv_encode_marc8.obj \
+ $(OBJDIR)\iconv_decode_marc8.obj \
+ $(OBJDIR)\iconv_encode_wchar.obj \
+ $(OBJDIR)\sc.obj
Z3950_OBJS= \
$(OBJDIR)\z-date.obj\
Z3950_OBJS= \
$(OBJDIR)\z-date.obj\
@@
-809,6
+826,10
@@
$(YAZ_ICU) : "$(BINDIR)" $(YAZ_ICU_OBJS) $(YAZ_ICU_DLL)
$(MT) -manifest $@.manifest -outputresource:$@;1
$(MT) -manifest $@.manifest -outputresource:$@;1
+$(SC_TEST) : "$(BINDIR)" $(SC_TEST_OBJS) $(YAZ_DLL)
+ $(LINK_PROGRAM) $(SC_TEST_OBJS) /out:$@
+ $(MT) -manifest $@.manifest -outputresource:$@;1
+
$(ZOOMSH) : "$(BINDIR)" $(YAZ_ZOOMSH_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMSH_OBJS) /out:$@
$(MT) -manifest $@.manifest -outputresource:$@;1
$(ZOOMSH) : "$(BINDIR)" $(YAZ_ZOOMSH_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(YAZ_ZOOMSH_OBJS) /out:$@
$(MT) -manifest $@.manifest -outputresource:$@;1