X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=9dea6dd9d780bba7e0a2fe7a1c7f58f97820d116;hp=002b3e5ae3035e8ffbb1a9d096e0163c3a15ad77;hb=dfdf794d56520037a623d858436ebfe7598a3113;hpb=4553ace9ab808a5db41bd7e03db6b8b4e9f8acc7

diff --git a/win/makefile b/win/makefile
index 002b3e5..9dea6dd 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
-# Makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.13 2000-02-28 11:13:03 adam Exp $
+# makefile.mak - makefile for MS NMAKE 
+# $Id: makefile,v 1.24 2001-08-14 12:05:58 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -31,7 +31,7 @@ NEW_Z3950=1  # 0= use old asn files
 
 default: all
 
-all: dirs proto_h dll client server ztest 
+all: dirs yaz_date_h proto_h dll client ztest 
 
 generate: generated_files
 
@@ -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
@@ -75,16 +76,16 @@ DLL=$(BINDIR)\Yaz.dll
 IMPLIB=$(LIBDIR)\Yaz.lib
 
 CLIENT=$(BINDIR)\yaz-client.exe
-SERVER=$(LIBDIR)\server.lib
 ZTEST=$(BINDIR)\yaz-ztest.exe
 PROTOH=$(INCLDIR)\yaz\proto.h
+YAZ_DATE_H=$(INCLDIR)\yaz\yaz-date.h
 
 # shortcut names defined here
 dll : $(DLL) 
 client: $(CLIENT)
-server: $(SERVER)
 ztest: $(ZTEST)
 proto_h: $(PROTOH)
+yaz_date_h: $(YAZ_DATE_H)
 
 ###########################################################
 ############### Compiler and linker options 
@@ -97,7 +98,9 @@ proto_h: $(PROTOH)
 
 COMMON_C_OPTIONS=          \
   /nologo /W3 /GX /FD /c   \
+  /D "YAZ_MODULE_ill=1"    \
   /D "WIN32" /D "_WINDOWS" \
+  /D "CCL2RPN=1"           \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\" 
@@ -133,9 +136,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 \
@@ -153,9 +155,10 @@ SERVER_LINK_OPTIONS = -lib
 ZTEST_LINK_OPTIONS = /subsystem:console  
 
 # TCL
-TCL="C:\Program Files\Tcl\bin\tclsh82.exe"
+TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
+HAVE_TCL=1
 
-COMMON_TCL_OPTIONS= ..\util\yc.tcl -I$(INCLDIR) -i yaz
+COMMON_TCL_OPTIONS= ..\util\yaz-comp -I$(INCLDIR) -i yaz
 
 # Final opt variables
 !if $(DEBUG)
@@ -184,7 +187,8 @@ TCLOPT= $(COMMON_TCL_OPTIONS)
 # need to be specified, though
 
 YAZ_CLIENT_OBJS= \
-   $(OBJDIR)\client.obj
+   $(OBJDIR)\client.obj \
+   $(OBJDIR)\admin.obj
 
 YAZ_SERVER_OBJS= \
 	"$(OBJDIR)\eventl.obj" \
@@ -197,7 +201,15 @@ YAZ_SERVER_OBJS= \
 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 \
@@ -267,7 +279,9 @@ YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\logrpn.obj \
    $(OBJDIR)\pquery.obj \
    $(OBJDIR)\yaz-ccl.obj \
-   $(OBJDIR)\otherinfo.obj
+   $(OBJDIR)\otherinfo.obj \
+   $(OBJDIR)\sortspec.obj
+
 
 YAZ_RET_OBJS= \
    $(OBJDIR)\d1_absyn.obj\
@@ -293,6 +307,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 \
@@ -314,7 +329,7 @@ Z3950_OBJS= \
    $(OBJDIR)\zes-pquery.obj \
    $(OBJDIR)\zes-psched.obj \
    $(OBJDIR)\zes-pset.obj \
-   $(OBJDIR)\zes-update0.obj 
+   $(OBJDIR)\zes-update0.obj
 
 ILL_OBJS= \
    $(OBJDIR)\ill-get.obj\
@@ -322,17 +337,19 @@ ILL_OBJS= \
    $(OBJDIR)\item-req.obj
 
 COMMON_YAZ_OBJS= \
-   $(YAZ_COMSTACK_OBJS) \
-   $(YAZ_ODR_OBJS) \
    $(YAZ_UTIL_OBJS) \
+   $(YAZ_ODR_OBJS) \
+   $(YAZ_COMSTACK_OBJS) \
    $(YAZ_ZUTIL_OBJS) \
-   $(YAZ_RET_OBJS)
+   $(YAZ_CCL_OBJS) \
+   $(YAZ_RET_OBJS) \
+   $(YAZ_SERVER_OBJS) 
 
 !if $(NEW_Z3950)
 YAZ_OBJS= \
 	$(COMMON_YAZ_OBJS) \
-	$(ILL_OBJS) \
-	$(Z3950_OBJS)
+	$(Z3950_OBJS) \
+	$(ILL_OBJS) 
 !else
 YAZ_OBJS= \
 	$(COMMON_YAZ_OBJS) \
@@ -344,7 +361,6 @@ DLL_OBJS= $(YAZ_OBJS)
 ALL_OBJS= \
 	$(YAZ_OBJS) \
 	$(YAZ_CLIENT_OBJS) \
-	$(YAZ_SERVER_OBJS) \
 	$(ZTEST_OBJS)
 
 
@@ -353,17 +369,20 @@ 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 
+!else	
+$(PROTOH): $(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)   
 ILL_C_DIR=$(ILLDIR)
@@ -381,6 +400,10 @@ UNIVRES_C_FILES = $(Z3950_C_DIR)\z-univ.c
 ESUPDATE_H_FILES = $(INCLDIR)\yaz\zes-update.h
 ESUPDATE_C_FILES = $(Z3950_C_DIR)\zes-update.c
 
+# Files generated from esadmin.asn
+ESADMIN_H_FILES = $(INCLDIR)\yaz\zes-admin.h
+ESADMIN_C_FILES = $(Z3950_C_DIR)\zes-admin.c
+
 # Files created from z3950v3.asn
 Z3950V3_H_FILES= \
    $(INCLDIR)\yaz\z-accdes1.h \
@@ -408,23 +431,27 @@ 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-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)
+ESADMIN_FILES = $(ESADMIN_H_FILES) $(ESADMIN_C_FILES)
 Z3950V3_FILES= $(Z3950V3_C_FILES) $(Z3950V3_H_FILES)
 ILL_CORE_FILES= $(ILL_CORE_C_FILES) $(ILL_CORE_H_FILES)
 ITEM_REQ_FILES= $(ITEM_REQ_C_FILES) $(ITEM_REQ_H_FILES)
@@ -433,19 +460,22 @@ 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) \
 	$(GENERATED_C_FILES) \
 	$(PROTOH)
 
+
 ###########################################################
 ############### Compiling 
 ###########################################################
@@ -467,35 +497,45 @@ 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
 
+!if $(HAVE_TCL)
+
+$(YAZ_DATE_H):
+	@cd ..
+	$(TCL) util\cvs-date.tcl include\yaz\yaz-date.h
+	@cd win
+
 $(Z3950V3_FILES): $(Z3950DIR)\z3950v3.asn
 	@cd $(Z3950DIR)
 	$(TCL) $(TCLOPT) -d z.tcl z3950v3.asn
@@ -516,6 +556,11 @@ $(ESUPDATE_FILES): $(Z3950DIR)\esupdate.asn
 	$(TCL) $(TCLOPT) -d z.tcl esupdate.asn
 	@cd $(WINDIR)
 
+$(ESADMIN_FILES): $(Z3950DIR)\esadmin.asn
+	@cd $(Z3950DIR)
+	$(TCL) $(TCLOPT) -d z.tcl esadmin.asn
+	@cd $(WINDIR)
+
 $(ILL_CORE_FILES): $(ILLDIR)\ill9702.asn
 	@cd $(ILLDIR)
 	$(TCL) $(TCLOPT) -d ill.tcl ill9702.asn
@@ -526,21 +571,47 @@ $(ITEM_REQ_FILES): $(ILLDIR)\item-req.asn
 	$(TCL) $(TCLOPT) -d ill.tcl item-req.asn
 	@cd $(WINDIR)
 
+!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" 
-		/map:"$(LIBDIR)/yaz.map"  
+		/implib:"$(LIBDIR)\yaz.lib"
+		/pdb:"$(LIBDIR)\yaz.pdb" 
+		/map:"$(LIBDIR)\yaz.map"  
 <<
 
 $(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) 
@@ -551,14 +622,12 @@ $(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)
 <<
 
-$(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(SERVER) $(DLL)
+$(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(DLL)
 	@echo Linking the ztest  $(ZTEST)
 	$(LINK) @<<
         $(LNKOPT) 
@@ -566,31 +635,16 @@ $(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(SERVER) $(DLL)
 		$(LINK_LIBS) 
 		shell32.lib
 		$(IMPLIB)
-		$(SERVER)
 		$(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) 
 <<
 
 
-$(SERVER) : "$(BINDIR)" $(YAZ_SERVER_OBJS) 
-	@echo Linking the server  $(SERVER)
-	$(LINK) $(SERVER_LINK_OPTIONS) @<<
-		/nologo
-		$(IMPLIB)
-		$(YAZ_SERVER_OBJS) 
-		/out:$(SERVER) 
-<<
-
 # note that this links a lib, so it uses completely different options.
 
-
-
 ###########################################################
 ############### Special operations
 ###########################################################
@@ -600,7 +654,6 @@ $(SERVER) : "$(BINDIR)" $(YAZ_SERVER_OBJS)
 clean:
 	del $(DLL) 
 	del $(CLIENT)
-	del $(SERVER)
 	del $(ZTEST)
 	del $(TMPDIR)\*.
 
@@ -635,7 +688,7 @@ $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
 ############### Explicit dependencies
 ###########################################################
 
-$(ALL_OBJS): makefile $(PROTOH)
+$(ALL_OBJS): $(PROTOH)
 
 # force recompilation of everything, if makefile changed
 
@@ -655,7 +708,40 @@ $(PROTOH): $(GENERATED_C_FILES) $(GENERATED_H_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.13  2000-02-28 11:13:03  adam
+# Revision 1.24  2001-08-14 12:05:58  adam
+# Added sortspec.
+#
+# Revision 1.23  2001/05/18 11:42:03  adam
+# YAZ Build date for WIN32.
+#
+# Revision 1.22  2001/03/09 14:58:20  adam
+# Updated version resource.
+#
+# 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
+# Minor changes.
+#
+# Revision 1.15  2000/04/17 14:21:38  adam
+# WIN32 update.
+#
+# Revision 1.14  2000/03/02 08:48:21  adam
+# Renamed ASN.1 compiler to yaz-comp (used to be yc.tcl).
+#
+# Revision 1.13  2000/02/28 11:13:03  adam
 # Removed odr_priv.obj.
 #
 # Revision 1.12  2000/01/06 11:27:16  adam