# makefile.mak - makefile for MS NMAKE
-# $Id: makefile,v 1.17 2000-10-06 12:01:12 adam Exp $
+# $Id: makefile,v 1.20 2000-12-01 17:56:41 adam Exp $
#
# Programmed by
# HL: Heikki Levanto, Index Data
RETDIR=$(SRCDIR)\RETRIEVAL
Z3950DIR=$(SRCDIR)\Z39.50
ILLDIR=$(SRCDIR)\ill
+CCLDIR=$(SRCDIR)\ccl
CLIENTDIR=$(SRCDIR)\CLIENT
SERVERDIR=$(SRCDIR)\SERVER
COMMON_C_OPTIONS= \
/nologo /W3 /GX /FD /c \
/D "WIN32" /D "_WINDOWS" \
+ /D "CCL2RPN=1" \
/FR"$(OBJDIR)\\" \
/Fo"$(OBJDIR)\\" \
/Fd"$(OBJDIR)\\"
### Linker options
LINK=link.exe
-LINK_LIBS= kernel32.lib user32.lib gdi32.lib winspool.lib \
- comdlg32.lib advapi32.lib shell32.lib ole32.lib \
- oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
+LINK_LIBS= kernel32.lib user32.lib gdi32.lib \
+ advapi32.lib uuid.lib \
wsock32.lib advapi32.lib
COMMON_LNK_OPTIONS= /nologo \
ZTEST_LINK_OPTIONS = /subsystem:console
# TCL
-TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
+TCL="C:\Program Files\Tcl\bin\tclsh82.exe"
HAVE_TCL=1
COMMON_TCL_OPTIONS= ..\util\yaz-comp -I$(INCLDIR) -i yaz
"$(OBJDIR)\read-grs.obj" \
"$(OBJDIR)\ztest.obj"
+YAZ_CCL_OBJS= \
+ $(OBJDIR)\cclerrms.obj \
+ $(OBJDIR)\cclfind.obj \
+ $(OBJDIR)\cclptree.obj \
+ $(OBJDIR)\cclqfile.obj \
+ $(OBJDIR)\cclqual.obj \
+ $(OBJDIR)\cclstr.obj \
+ $(OBJDIR)\ccltoken.obj
+
YAZ_ASN_OBJS= \
$(OBJDIR)\proto.obj \
$(OBJDIR)\prt-acc.obj \
$(YAZ_ODR_OBJS) \
$(YAZ_COMSTACK_OBJS) \
$(YAZ_ZUTIL_OBJS) \
+ $(YAZ_CCL_OBJS) \
$(YAZ_RET_OBJS) \
- $(YAZ_SERVER_OBJS)
+ $(YAZ_SERVER_OBJS)
!if $(NEW_Z3950)
YAZ_OBJS= \
# Server
{$(SERVERDIR)}.c{$(OBJDIR)}.obj:
- @$(CPP) $(COPT) $<
+ $(CPP) $(COPT) $<
# Various YAZ source directories
{$(ASNDIR)}.c{$(OBJDIR)}.obj:
- @$(CPP) $(COPT) $<
+ $(CPP) $(COPT) $<
{$(COMSTACKDIR)}.c{$(OBJDIR)}.obj:
- @$(CPP) $(COPT) $<
+ $(CPP) $(COPT) $<
{$(ODRDIR)}.c{$(OBJDIR)}.obj:
- @$(CPP) $(COPT) $<
+ $(CPP) $(COPT) $<
{$(UTILDIR)}.c{$(OBJDIR)}.obj:
- @$(CPP) $(COPT) $<
+ $(CPP) $(COPT) $<
{$(ZUTILDIR)}.c{$(OBJDIR)}.obj:
- @$(CPP) $(COPT) $<
+ $(CPP) $(COPT) $<
{$(RETDIR)}.c{$(OBJDIR)}.obj:
- @$(CPP) $(COPT) $<
+ $(CPP) $(COPT) $<
{$(Z3950_C_DIR)}.c{$(OBJDIR)}.obj:
- @$(CPP) $(COPT) $<
+ $(CPP) $(COPT) $<
{$(ILL_C_DIR)}.c{$(OBJDIR)}.obj:
- @$(CPP) $(COPT) $<
+ $(CPP) $(COPT) $<
+
+{$(CCLDIR)}.c{$(OBJDIR)}.obj:
+ $(CPP) $(COPT) $<
############### ASN-generated files
###########################################################
#
# $Log: makefile,v $
-# Revision 1.17 2000-10-06 12:01:12 adam
+# Revision 1.20 2000-12-01 17:56:41 adam
+# on WIN32 function statserv_closedown closes socket(s) to provoke close.
+#
+# Revision 1.19 2000/11/16 13:03:13 adam
+# Function ccl_rpn_query sets attributeSet to Bib-1.
+#
+# Revision 1.18 2000/11/01 14:47:00 adam
+# Added CCL support for WIN32.
+#
+# Revision 1.17 2000/10/06 12:01:12 adam
# Updates regarding ASN-code generation (mostly).
#
# Revision 1.16 2000/05/05 13:48:15 adam