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
Documentation updates for new names of dll/so files.
[yaz-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
0600251
..
1ec2e1a
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,6
+1,6
@@
# Copyright (C) 1995-2007, Index Data ApS
# All rights reserved.
# Copyright (C) 1995-2007, Index Data ApS
# All rights reserved.
-# $Id: makefile,v 1.126 2007-01-09 13:56:49 adam Exp $
+# $Id: makefile,v 1.132 2007-05-01 12:48:07 adam Exp $
#
# Programmed by
# Heikki Levanto & Adam Dickmeiss
#
# Programmed by
# Heikki Levanto & Adam Dickmeiss
@@
-88,10
+88,10
@@
TMP=$(TMPDIR)
# Targets - what to make
!if $(DEBUG)
# Targets - what to make
!if $(DEBUG)
-DLL=$(BINDIR)\yazd.dll
+DLL=$(BINDIR)\yaz3d.dll
YAZ_IMPLIB=$(LIBDIR)\yazd.lib
!else
YAZ_IMPLIB=$(LIBDIR)\yazd.lib
!else
-DLL=$(BINDIR)\yaz.dll
+DLL=$(BINDIR)\yaz3.dll
YAZ_IMPLIB=$(LIBDIR)\yaz.lib
!endif
YAZ_IMPLIB=$(LIBDIR)\yaz.lib
!endif
@@
-281,7
+281,8
@@
LINK_DLL = $(LINK) $(LNKOPT) \
YAZ_CLIENT_OBJS= \
$(OBJDIR)\client.obj \
$(OBJDIR)\tabcomplete.obj \
YAZ_CLIENT_OBJS= \
$(OBJDIR)\client.obj \
$(OBJDIR)\tabcomplete.obj \
- $(OBJDIR)\admin.obj
+ $(OBJDIR)\admin.obj \
+ $(OBJDIR)\fhistory.obj
ZTEST_OBJS= \
$(OBJDIR)\read-marc.obj \
ZTEST_OBJS= \
$(OBJDIR)\read-marc.obj \
@@
-327,6
+328,7
@@
TST_TIMING_OBJS = \
MISC_OBJS= \
$(OBJDIR)\version.obj \
MISC_OBJS= \
$(OBJDIR)\version.obj \
+ $(OBJDIR)\oid_std.obj \
$(OBJDIR)\eventl.obj \
$(OBJDIR)\requestq.obj \
$(OBJDIR)\service.obj \
$(OBJDIR)\eventl.obj \
$(OBJDIR)\requestq.obj \
$(OBJDIR)\service.obj \
@@
-340,6
+342,7
@@
MISC_OBJS= \
$(OBJDIR)\cclqual.obj \
$(OBJDIR)\cclstr.obj \
$(OBJDIR)\ccltoken.obj \
$(OBJDIR)\cclqual.obj \
$(OBJDIR)\cclstr.obj \
$(OBJDIR)\ccltoken.obj \
+ $(OBJDIR)\ccl_stop_words.obj \
$(OBJDIR)\comstack.obj \
$(OBJDIR)\tcpip.obj \
$(OBJDIR)\waislen.obj \
$(OBJDIR)\comstack.obj \
$(OBJDIR)\tcpip.obj \
$(OBJDIR)\waislen.obj \
@@
-377,7
+380,8
@@
MISC_OBJS= \
$(OBJDIR)\marc_read_line.obj \
$(OBJDIR)\nmem.obj \
$(OBJDIR)\nmemsdup.obj \
$(OBJDIR)\marc_read_line.obj \
$(OBJDIR)\nmem.obj \
$(OBJDIR)\nmemsdup.obj \
- $(OBJDIR)\oid.obj \
+ $(OBJDIR)\oid_db.obj \
+ $(OBJDIR)\oid_util.obj \
$(OBJDIR)\options.obj \
$(OBJDIR)\readconf.obj \
$(OBJDIR)\tpath.obj \
$(OBJDIR)\options.obj \
$(OBJDIR)\readconf.obj \
$(OBJDIR)\tpath.obj \
@@
-385,6
+389,7
@@
MISC_OBJS= \
$(OBJDIR)\xmalloc.obj \
$(OBJDIR)\matchstr.obj \
$(OBJDIR)\siconv.obj \
$(OBJDIR)\xmalloc.obj \
$(OBJDIR)\matchstr.obj \
$(OBJDIR)\siconv.obj \
+ $(OBJDIR)\snprintf.obj \
$(OBJDIR)\marc8.obj \
$(OBJDIR)\marc8r.obj \
$(OBJDIR)\record_conv.obj \
$(OBJDIR)\marc8.obj \
$(OBJDIR)\marc8r.obj \
$(OBJDIR)\record_conv.obj \
@@
-402,7
+407,6
@@
MISC_OBJS= \
$(OBJDIR)\yaz-ccl.obj \
$(OBJDIR)\otherinfo.obj \
$(OBJDIR)\sortspec.obj \
$(OBJDIR)\yaz-ccl.obj \
$(OBJDIR)\otherinfo.obj \
$(OBJDIR)\sortspec.obj \
- $(OBJDIR)\z3950oid.obj \
$(OBJDIR)\charneg.obj \
$(OBJDIR)\grs1disp.obj \
$(OBJDIR)\opacdisp.obj \
$(OBJDIR)\charneg.obj \
$(OBJDIR)\grs1disp.obj \
$(OBJDIR)\opacdisp.obj \
@@
-424,7
+428,11
@@
MISC_OBJS= \
$(OBJDIR)\cqlstrer.obj \
$(OBJDIR)\xcqlutil.obj \
$(OBJDIR)\elementset.obj \
$(OBJDIR)\cqlstrer.obj \
$(OBJDIR)\xcqlutil.obj \
$(OBJDIR)\elementset.obj \
- $(OBJDIR)\timing.obj
+ $(OBJDIR)\timing.obj \
+ $(OBJDIR)\query-charset.obj \
+ $(OBJDIR)\tokenizer.obj \
+ $(OBJDIR)\copy_types.obj \
+ $(OBJDIR)\http.obj
Z3950_OBJS= \
$(OBJDIR)\z-date.obj\
Z3950_OBJS= \
$(OBJDIR)\z-date.obj\
@@
-607,7
+615,7
@@
generated_files: \
# Various YAZ source directories
{$(SRCDIR)}.c{$(OBJDIR)}.obj:
# Various YAZ source directories
{$(SRCDIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
+ $(CPP) $(COPT) /D"YAZ_DLL" $<
{$(ZOOMDIR)}.c{$(OBJDIR)}.obj:
$(CPP) $(COPT) $<
{$(ZOOMDIR)}.c{$(OBJDIR)}.obj:
$(CPP) $(COPT) $<
@@
-680,6
+688,10
@@
$(SRCDIR)\marc8r.c: $(SRCDIR)\codetables.xml $(SRCDIR)\charconv.tcl
@cd $(SRCDIR)
$(TCL) charconv.tcl -r -p marc8r codetables.xml -o marc8r.c
@cd $(SRCDIR)
$(TCL) charconv.tcl -r -p marc8r codetables.xml -o marc8r.c
+$(SRCDIR)\oid_std.c: $(SRCDIR)\oid.csv $(SRCDIR)\charconv.tcl
+ @cd $(SRCDIR)
+ $(TCL) oidtoc.tcl $(SRCDIR) oid.csv oid_std.c oid_std.h
+
$(SRCDIR)\diagbib1.c: $(SRCDIR)\bib1.csv
@cd $(SRCDIR)
$(TCL) csvtobib1.tcl $(SRCDIR)
$(SRCDIR)\diagbib1.c: $(SRCDIR)\bib1.csv
@cd $(SRCDIR)
$(TCL) csvtobib1.tcl $(SRCDIR)