X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=1ec2e1afb14b0a6f7f60846f7f0f97476e60084f;hp=ab48fca354b274290fc51609fea42a2f1b3be1c2;hb=d65ca0fdac8b4cddb7b6da4568a55b8e52d44e64;hpb=021f5586a328c6600460aa9f9be664ba19ba20d4

diff --git a/win/makefile b/win/makefile
index ab48fca..1ec2e1a 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 1995-2007, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.129 2007-02-23 10:15:02 adam Exp $
+# $Id: makefile,v 1.132 2007-05-01 12:48:07 adam Exp $
 #
 # Programmed by
 #  Heikki Levanto & Adam Dickmeiss
@@ -88,10 +88,10 @@ TMP=$(TMPDIR)
 # Targets - what to make
 
 !if $(DEBUG)
-DLL=$(BINDIR)\yazd.dll
+DLL=$(BINDIR)\yaz3d.dll
 YAZ_IMPLIB=$(LIBDIR)\yazd.lib
 !else
-DLL=$(BINDIR)\yaz.dll
+DLL=$(BINDIR)\yaz3.dll
 YAZ_IMPLIB=$(LIBDIR)\yaz.lib
 !endif
 
@@ -328,6 +328,7 @@ TST_TIMING_OBJS = \
 
 MISC_OBJS= \
    $(OBJDIR)\version.obj \
+   $(OBJDIR)\oid_std.obj \
    $(OBJDIR)\eventl.obj \
    $(OBJDIR)\requestq.obj \
    $(OBJDIR)\service.obj \
@@ -341,6 +342,7 @@ MISC_OBJS= \
    $(OBJDIR)\cclqual.obj \
    $(OBJDIR)\cclstr.obj \
    $(OBJDIR)\ccltoken.obj \
+   $(OBJDIR)\ccl_stop_words.obj \
    $(OBJDIR)\comstack.obj \
    $(OBJDIR)\tcpip.obj \
    $(OBJDIR)\waislen.obj \
@@ -378,7 +380,8 @@ MISC_OBJS= \
    $(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 \
@@ -404,7 +407,6 @@ MISC_OBJS= \
    $(OBJDIR)\yaz-ccl.obj \
    $(OBJDIR)\otherinfo.obj \
    $(OBJDIR)\sortspec.obj \
-   $(OBJDIR)\z3950oid.obj \
    $(OBJDIR)\charneg.obj \
    $(OBJDIR)\grs1disp.obj \
    $(OBJDIR)\opacdisp.obj \
@@ -427,6 +429,9 @@ MISC_OBJS= \
    $(OBJDIR)\xcqlutil.obj \
    $(OBJDIR)\elementset.obj \
    $(OBJDIR)\timing.obj \
+   $(OBJDIR)\query-charset.obj \
+   $(OBJDIR)\tokenizer.obj \
+   $(OBJDIR)\copy_types.obj \
    $(OBJDIR)\http.obj
 
 Z3950_OBJS= \
@@ -610,7 +615,7 @@ generated_files: \
 
 # Various YAZ source directories
 {$(SRCDIR)}.c{$(OBJDIR)}.obj:
-	$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) /D"YAZ_DLL" $< 
 
 {$(ZOOMDIR)}.c{$(OBJDIR)}.obj:
 	$(CPP) $(COPT) $< 
@@ -683,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
 
+$(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)