Added version info for WIN32.

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

diff --git a/win/makefile b/win/makefile
index 0d20519..20c3ee2 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.17 2000-10-06 12:01:12 adam Exp $
+# $Id: makefile,v 1.21 2001-02-28 16:56:33 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)\\" 
@@ -131,9 +133,8 @@ RELEASE_C_OPTIONS=  \
 ### 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 \
@@ -151,7 +152,7 @@ SERVER_LINK_OPTIONS = -lib
 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
@@ -198,6 +199,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 \
@@ -326,8 +336,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= \
@@ -353,10 +364,10 @@ ALL_OBJS= \
 ##########################################################
 
 !if $(NEW_Z3950)
-$(PROTOH): makefile $(INCLDIR)\yaz\z-proto.h
+$(PROTOH): $(INCLDIR)\yaz\z-proto.h
        type $(INCLDIR)\yaz\z-proto.h > $(PROTOH)
 !else  
-$(PROTOH): makefile $(INCLDIR)\yaz\prt-proto.h 
+$(PROTOH): $(INCLDIR)\yaz\prt-proto.h 
        copy $(ASNDIR)\*.h $(INCLDIR)\yaz
        type $(INCLDIR)\yaz\prt-proto.h > $(PROTOH)
 !endif
@@ -481,32 +492,35 @@ generated_files: \
 
 # 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
 
@@ -549,17 +563,41 @@ $(ITEM_REQ_FILES): $(ILLDIR)\item-req.asn
 
 !endif
 
+
+###########################################################
+############### Resources
+###########################################################
+
+### The RC compiler (resource files)
+RSC=rc.exe
+COMMON_RC_OPTIONS= /l 0x406 /i"$(ROOTDIR)" 
+DEBUG_RC_OPTIONS=/d "_DEBUG"
+RELEASE_RC_OPTIONS=/d "NDEBUG"
+
+YAZ_RES=$(OBJDIR)\yaz.res
+YAZ_RC=$(WINDIR)\yaz.rc
+
+!if $(DEBUG)
+RSOPT=/d_DEBUG
+!else
+RSOPT=/d_NDEBUG
+!endif
+
+$(YAZ_RES): $(YAZ_RC)
+       $(RSC) $(RSOPT) /fo"$(YAZ_RES)" $(YAZ_RC) 
+
 ###########################################################
 ############### Linking
 ###########################################################
 
-$(DLL) $(IMPLIB): "$(BINDIR)" $(DLL_OBJS) 
+$(DLL) $(IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
        @echo Linking the dll  $(DLL)
        $(LINK) @<<
                $(LNKOPT) 
                $(LINK_LIBS) 
                $(DLL_LINK_OPTIONS)
-               $(DLL_OBJS) 
+               $(DLL_OBJS)
+               $(YAZ_RES)
                /out:$(DLL) 
                /implib:"$(LIBDIR)\yaz.lib"
                /pdb:"$(LIBDIR)\yaz.pdb" 
@@ -660,7 +698,19 @@ $(PROTOH): $(GENERATED_C_FILES) $(GENERATED_H_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.17  2000-10-06 12:01:12  adam
+# Revision 1.21  2001-02-28 16:56:33  adam
+# Added version info for WIN32.
+#
+# 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