Added CCL support for WIN32.

[yaz-moved-to-github.git] / win / makefile

diff --git a/win/makefile b/win/makefile
index 68d5e24..3353ff0 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
-# Makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.15 2000-04-17 14:21:38 adam Exp $
+# makefile.mak - makefile for MS NMAKE 
+# $Id: makefile,v 1.18 2000-11-01 14:47:00 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -58,6 +58,7 @@ ZUTILDIR=$(SRCDIR)\ZUTIL
 RETDIR=$(SRCDIR)\RETRIEVAL
 Z3950DIR=$(SRCDIR)\Z39.50
 ILLDIR=$(SRCDIR)\ill
+CCLDIR=$(SRCDIR)\ccl
 
 CLIENTDIR=$(SRCDIR)\CLIENT
 SERVERDIR=$(SRCDIR)\SERVER
@@ -96,6 +97,7 @@ proto_h: $(PROTOH)
 COMMON_C_OPTIONS=          \
   /nologo /W3 /GX /FD /c   \
   /D "WIN32" /D "_WINDOWS" \
+  /D "CCL2RPN=1"           \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\" 
@@ -151,8 +153,8 @@ SERVER_LINK_OPTIONS = -lib
 ZTEST_LINK_OPTIONS = /subsystem:console  
 
 # TCL
-TCL="C:\Program Files\Tcl\bin\tclsh82.exe"
-HAVE_TCL=0
+TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
+HAVE_TCL=1
 
 COMMON_TCL_OPTIONS= ..\util\yaz-comp -I$(INCLDIR) -i yaz
 
@@ -198,6 +200,15 @@ ZTEST_OBJS= \
        "$(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 \
@@ -292,6 +303,7 @@ Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
    $(OBJDIR)\z-univ.obj\
    $(OBJDIR)\zes-update.obj\
+   $(OBJDIR)\zes-admin.obj \
    $(OBJDIR)\z-accdes1.obj \
    $(OBJDIR)\z-accform1.obj \
    $(OBJDIR)\z-acckrb1.obj \
@@ -313,8 +325,7 @@ Z3950_OBJS= \
    $(OBJDIR)\zes-pquery.obj \
    $(OBJDIR)\zes-psched.obj \
    $(OBJDIR)\zes-pset.obj \
-   $(OBJDIR)\zes-update0.obj \
-   $(OBJDIR)\zes-admin.obj
+   $(OBJDIR)\zes-update0.obj
 
 ILL_OBJS= \
    $(OBJDIR)\ill-get.obj\
@@ -326,8 +337,9 @@ COMMON_YAZ_OBJS= \
    $(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= \
@@ -355,15 +367,17 @@ ALL_OBJS= \
 !if $(NEW_Z3950)
 $(PROTOH): makefile $(INCLDIR)\yaz\z-proto.h
        type $(INCLDIR)\yaz\z-proto.h > $(PROTOH)
-!else
+!else  
 $(PROTOH): makefile $(INCLDIR)\yaz\prt-proto.h 
+       copy $(ASNDIR)\*.h $(INCLDIR)\yaz
        type $(INCLDIR)\yaz\prt-proto.h > $(PROTOH)
 !endif
 
 
 ###########################################################
 ############### Generated C and H files
-###########################################################
+#####
+######################################################
 
 
 Z3950_C_DIR=$(Z3950DIR)   
@@ -413,21 +427,23 @@ Z3950V3_C_FILES= \
    $(Z3950_C_DIR)\zes-pquery.c \
    $(Z3950_C_DIR)\zes-psched.c \
    $(Z3950_C_DIR)\zes-pset.c \
-   $(Z3950_C_DIR)\zes-update0.c \
-   $(Z3950_C_DIR)\zes-admin.c
+   $(Z3950_C_DIR)\zes-update0.c
 
+# Files generated from ill9702.asn
 ILL_CORE_H_FILES= \
    $(INCLDIR)\yaz\ill-core.h
 
 ILL_CORE_C_FILES= \
    $(ILL_C_DIR)\ill-core.c
 
+# Files generated from itemreq.asn
 ITEM_REQ_H_FILES= \
    $(INCLDIR)\yaz\item-req.h
 
 ITEM_REQ_C_FILES= \
    $(ILL_C_DIR)\item-req.c
 
+# Combined..
 DATETIME_FILES = $(DATETIME_H_FILES) $(DATETIME_C_FILES)
 UNIVRES_FILES = $(UNIVRES_H_FILES) $(UNIVRES_C_FILES)
 ESUPDATE_FILES = $(ESUPDATE_H_FILES) $(ESUPDATE_C_FILES)
@@ -440,13 +456,15 @@ GENERATED_C_FILES= \
    $(Z3950V3_C_FILES)  \
    $(ESUPDATE_C_FILES) \
    $(UNIVRES_C_FILES)  \
-   $(DATETIME_C_FILES)
+   $(DATETIME_C_FILES) \
+   $(ESADMIN_C_FILES)
 
 GENERATED_H_FILES= \
    $(Z3950V3_H_FILES)  \
    $(ESUPDATE_H_FILES) \
    $(UNIVRES_H_FILES)  \
-   $(DATETIME_H_FILES)
+   $(DATETIME_H_FILES) \
+   $(ESADMIN_H_FILES)
 
 generated_files: \
        $(GENERATED_H_FILES) \
@@ -502,6 +520,9 @@ generated_files: \
 {$(ILL_C_DIR)}.c{$(OBJDIR)}.obj:
        @$(CPP) $(COPT) $< 
 
+{$(CCLDIR)}.c{$(OBJDIR)}.obj:
+       @$(CPP) $(COPT) $< 
+
 ############### ASN-generated files
 
 !if $(HAVE_TCL)
@@ -555,9 +576,9 @@ $(DLL) $(IMPLIB): "$(BINDIR)" $(DLL_OBJS)
                $(DLL_LINK_OPTIONS)
                $(DLL_OBJS) 
                /out:$(DLL) 
-               /implib:"$(LIBDIR)/yaz.lib"
-               /pdb:"$(LIBDIR)/yaz.pdb" 
-               /map:"$(LIBDIR)/yaz.map"  
+               /implib:"$(LIBDIR)\yaz.lib"
+               /pdb:"$(LIBDIR)\yaz.pdb" 
+               /map:"$(LIBDIR)\yaz.map"  
 <<
 
 $(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) 
@@ -568,10 +589,8 @@ $(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS)
                $(LINK_LIBS) 
                $(IMPLIB)
                $(YAZ_CLIENT_OBJS)
-
-               /pdb:"$(LIBDIR)/yaz-client.pdb"
-
-               /map:"$(LIBDIR)/yaz-client.map"
+               /pdb:"$(LIBDIR)\yaz-client.pdb"
+               /map:"$(LIBDIR)\yaz-client.map"
                /out:$(CLIENT)
 <<
 
@@ -584,12 +603,9 @@ $(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(DLL)
                shell32.lib
                $(IMPLIB)
                $(ZTEST_OBJS) 
-
-               /implib:"$(LIBDIR)/yaz-ztest.lib"
-
-               /pdb:"$(LIBDIR)/yaz-ztest.pdb"
-
-               /map:"$(LIBDIR)/yaz-ztest.map"
+               /implib:"$(LIBDIR)\yaz-ztest.lib"
+               /pdb:"$(LIBDIR)\yaz-ztest.pdb"
+               /map:"$(LIBDIR)\yaz-ztest.map"
                /out:$(ZTEST) 
 <<
 
@@ -659,7 +675,16 @@ $(PROTOH): $(GENERATED_C_FILES) $(GENERATED_H_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.15  2000-04-17 14:21:38  adam
+# 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
+# Minor changes.
+#
+# Revision 1.15  2000/04/17 14:21:38  adam
 # WIN32 update.
 #
 # Revision 1.14  2000/03/02 08:48:21  adam