# makefile.mak - makefile for MS NMAKE
-# $Id: makefile,v 1.17 2000-10-06 12:01:12 adam Exp $
+# $Id: makefile,v 1.28 2001-10-25 10:45:08 adam Exp $
#
# Programmed by
# HL: Heikki Levanto, Index Data
############### Parameters
###########################################################
-DEBUG=1 # 0 for release, 1 for debug
-
-NEW_Z3950=1 # 0= use old asn files
- # 1= generate files from *.asn (needs tcl)
-
+DEBUG=0 # 0 for release, 1 for debug
default: all
-all: dirs proto_h dll client ztest
+all: dirs yaz_date_h dll client ztest zoomsh
generate: generated_files
RETDIR=$(SRCDIR)\RETRIEVAL
Z3950DIR=$(SRCDIR)\Z39.50
ILLDIR=$(SRCDIR)\ill
+CCLDIR=$(SRCDIR)\ccl
+ZOOMDIR=$(SRCDIR)\zoom
CLIENTDIR=$(SRCDIR)\CLIENT
SERVERDIR=$(SRCDIR)\SERVER
IMPLIB=$(LIBDIR)\Yaz.lib
CLIENT=$(BINDIR)\yaz-client.exe
+ZOOMSH=$(BINDIR)\zoomsh.exe
ZTEST=$(BINDIR)\yaz-ztest.exe
-PROTOH=$(INCLDIR)\yaz\proto.h
+YAZ_DATE_H=$(INCLDIR)\yaz\yaz-date.h
+
+ZOOMTST1=$(BINDIR)\zoomtst1.exe
+ZOOMTST2=$(BINDIR)\zoomtst2.exe
+ZOOMTST3=$(BINDIR)\zoomtst3.exe
+ZOOMTST4=$(BINDIR)\zoomtst4.exe
+ZOOMTST5=$(BINDIR)\zoomtst5.exe
+ZOOMTST6=$(BINDIR)\zoomtst6.exe
+ZOOMTST7=$(BINDIR)\zoomtst7.exe
+
# shortcut names defined here
dll : $(DLL)
client: $(CLIENT)
ztest: $(ZTEST)
-proto_h: $(PROTOH)
+zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
+ $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7)
+yaz_date_h: $(YAZ_DATE_H)
###########################################################
############### Compiler and linker options
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)\\"
### 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 \
DLL_LINK_OPTIONS= /dll
CLIENT_LINK_OPTIONS = /subsystem:console
+ZOOMSH_LINK_OPTIONS = /subsystem:console
SERVER_LINK_OPTIONS = -lib
ZTEST_LINK_OPTIONS = /subsystem:console
$(OBJDIR)\client.obj \
$(OBJDIR)\admin.obj
+YAZ_ZOOMSH_OBJS = \
+ $(OBJDIR)\zoomsh.obj
+
+YAZ_ZOOMTST1_OBJS = \
+ $(OBJDIR)\zoomtst1.obj
+YAZ_ZOOMTST2_OBJS = \
+ $(OBJDIR)\zoomtst2.obj
+YAZ_ZOOMTST3_OBJS = \
+ $(OBJDIR)\zoomtst3.obj
+YAZ_ZOOMTST4_OBJS = \
+ $(OBJDIR)\zoomtst4.obj
+YAZ_ZOOMTST5_OBJS = \
+ $(OBJDIR)\zoomtst5.obj
+YAZ_ZOOMTST6_OBJS = \
+ $(OBJDIR)\zoomtst6.obj
+YAZ_ZOOMTST7_OBJS = \
+ $(OBJDIR)\zoomtst7.obj
+
YAZ_SERVER_OBJS= \
"$(OBJDIR)\eventl.obj" \
"$(OBJDIR)\requestq.obj" \
"$(OBJDIR)\read-grs.obj" \
"$(OBJDIR)\ztest.obj"
-YAZ_ASN_OBJS= \
- $(OBJDIR)\proto.obj \
- $(OBJDIR)\prt-acc.obj \
- $(OBJDIR)\prt-add.obj \
- $(OBJDIR)\prt-arc.obj \
- $(OBJDIR)\prt-dat.obj \
- $(OBJDIR)\prt-dia.obj \
- $(OBJDIR)\prt-esp.obj \
- $(OBJDIR)\prt-exd.obj \
- $(OBJDIR)\prt-exp.obj \
- $(OBJDIR)\prt-grs.obj \
- $(OBJDIR)\prt-rsc.obj \
- $(OBJDIR)\prt-univ.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_COMSTACK_OBJS= \
$(OBJDIR)\comstack.obj \
YAZ_ZUTIL_OBJS= \
$(OBJDIR)\diagbib1.obj \
$(OBJDIR)\zget.obj \
- $(OBJDIR)\prt-ext.obj \
$(OBJDIR)\logrpn.obj \
$(OBJDIR)\pquery.obj \
$(OBJDIR)\yaz-ccl.obj \
- $(OBJDIR)\otherinfo.obj
+ $(OBJDIR)\otherinfo.obj \
+ $(OBJDIR)\sortspec.obj \
+ $(OBJDIR)\z3950oid.obj
+
YAZ_RET_OBJS= \
$(OBJDIR)\d1_absyn.obj\
$(OBJDIR)\zes-pquery.obj \
$(OBJDIR)\zes-psched.obj \
$(OBJDIR)\zes-pset.obj \
- $(OBJDIR)\zes-update0.obj
+ $(OBJDIR)\zes-update0.obj \
+ $(OBJDIR)\prt-ext.obj
ILL_OBJS= \
$(OBJDIR)\ill-get.obj\
$(OBJDIR)\ill-core.obj\
$(OBJDIR)\item-req.obj
+YAZ_ZOOM_OBJS = \
+ $(OBJDIR)\zoom-c.obj \
+ $(OBJDIR)\zoom-opt.obj
+
COMMON_YAZ_OBJS= \
$(YAZ_UTIL_OBJS) \
$(YAZ_ODR_OBJS) \
$(YAZ_COMSTACK_OBJS) \
$(YAZ_ZUTIL_OBJS) \
+ $(YAZ_CCL_OBJS) \
$(YAZ_RET_OBJS) \
- $(YAZ_SERVER_OBJS)
+ $(YAZ_SERVER_OBJS) \
+ $(YAZ_ZOOM_OBJS)
-!if $(NEW_Z3950)
YAZ_OBJS= \
$(COMMON_YAZ_OBJS) \
$(Z3950_OBJS) \
$(ILL_OBJS)
-!else
-YAZ_OBJS= \
- $(COMMON_YAZ_OBJS) \
- $(YAZ_ASN_OBJS)
-!endif
DLL_OBJS= $(YAZ_OBJS)
$(YAZ_CLIENT_OBJS) \
$(ZTEST_OBJS)
-
-##########################################################
-############## proto.h
-##########################################################
-
-!if $(NEW_Z3950)
-$(PROTOH): makefile $(INCLDIR)\yaz\z-proto.h
- type $(INCLDIR)\yaz\z-proto.h > $(PROTOH)
-!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)
ILL_C_DIR=$(ILLDIR)
#!!! Should be moved to OBJ, but that requires too much trickery
generated_files: \
$(GENERATED_H_FILES) \
$(GENERATED_C_FILES) \
- $(PROTOH)
-
###########################################################
############### Compiling
# 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) $<
+
+{$(ZOOMDIR)}.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
!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"
<<
$(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS)
- @echo Linking the client $(CLIENT)
+ @echo Linking $(CLIENT)
$(LINK) @<<
$(LNKOPT)
$(CLIENT_LINK_OPTIONS)
/out:$(CLIENT)
<<
+$(ZOOMSH) : "$(BINDIR)" $(YAZ_ZOOMSH_OBJS)
+ @echo Linking $(ZOOMSH)
+ $(LINK) @<<
+ $(LNKOPT)
+ $(ZOOMSH_LINK_OPTIONS)
+ $(LINK_LIBS)
+ $(IMPLIB)
+ $(YAZ_ZOOMSH_OBJS)
+ /pdb:"$(LIBDIR)\zoomsh.pdb"
+ /map:"$(LIBDIR)\zoomsh.map"
+ /out:$(ZOOMSH)
+<<
+
+$(ZOOMTST1) : "$(BINDIR)" $(YAZ_ZOOMTST1_OBJS)
+ @echo Linking $(ZOOMTST1)
+ $(LINK) @<<
+ $(LNKOPT)
+ $(ZOOMSH_LINK_OPTIONS)
+ $(LINK_LIBS)
+ $(IMPLIB)
+ $(YAZ_ZOOMTST1_OBJS)
+ /pdb:"$(LIBDIR)\zoomtst1.pdb"
+ /map:"$(LIBDIR)\zoomtst1.map"
+ /out:$(ZOOMTST1)
+<<
+
+$(ZOOMTST2) : "$(BINDIR)" $(YAZ_ZOOMTST2_OBJS)
+ @echo Linking $(ZOOMTST2)
+ $(LINK) @<<
+ $(LNKOPT)
+ $(ZOOMSH_LINK_OPTIONS)
+ $(LINK_LIBS)
+ $(IMPLIB)
+ $(YAZ_ZOOMTST2_OBJS)
+ /pdb:"$(LIBDIR)\zoomtst2.pdb"
+ /map:"$(LIBDIR)\zoomtst2.map"
+ /out:$(ZOOMTST2)
+<<
+
+$(ZOOMTST3) : "$(BINDIR)" $(YAZ_ZOOMTST3_OBJS)
+ @echo Linking $(ZOOMTST3)
+ $(LINK) @<<
+ $(LNKOPT)
+ $(ZOOMSH_LINK_OPTIONS)
+ $(LINK_LIBS)
+ $(IMPLIB)
+ $(YAZ_ZOOMTST3_OBJS)
+ /pdb:"$(LIBDIR)\zoomtst3.pdb"
+ /map:"$(LIBDIR)\zoomtst3.map"
+ /out:$(ZOOMTST3)
+<<
+
+$(ZOOMTST4) : "$(BINDIR)" $(YAZ_ZOOMTST4_OBJS)
+ @echo Linking $(ZOOMTST4)
+ $(LINK) @<<
+ $(LNKOPT)
+ $(ZOOMSH_LINK_OPTIONS)
+ $(LINK_LIBS)
+ $(IMPLIB)
+ $(YAZ_ZOOMTST4_OBJS)
+ /pdb:"$(LIBDIR)\zoomtst4.pdb"
+ /map:"$(LIBDIR)\zoomtst4.map"
+ /out:$(ZOOMTST4)
+<<
+
+$(ZOOMTST5) : "$(BINDIR)" $(YAZ_ZOOMTST5_OBJS)
+ @echo Linking $(ZOOMTST5)
+ $(LINK) @<<
+ $(LNKOPT)
+ $(ZOOMSH_LINK_OPTIONS)
+ $(LINK_LIBS)
+ $(IMPLIB)
+ $(YAZ_ZOOMTST5_OBJS)
+ /pdb:"$(LIBDIR)\zoomtst5.pdb"
+ /map:"$(LIBDIR)\zoomtst5.map"
+ /out:$(ZOOMTST5)
+<<
+
+$(ZOOMTST6) : "$(BINDIR)" $(YAZ_ZOOMTST6_OBJS)
+ @echo Linking $(ZOOMTST6)
+ $(LINK) @<<
+ $(LNKOPT)
+ $(ZOOMSH_LINK_OPTIONS)
+ $(LINK_LIBS)
+ $(IMPLIB)
+ $(YAZ_ZOOMTST6_OBJS)
+ /pdb:"$(LIBDIR)\zoomtst6.pdb"
+ /map:"$(LIBDIR)\zoomtst6.map"
+ /out:$(ZOOMTST6)
+<<
+
+$(ZOOMTST7) : "$(BINDIR)" $(YAZ_ZOOMTST7_OBJS)
+ @echo Linking $(ZOOMTST7)
+ $(LINK) @<<
+ $(LNKOPT)
+ $(ZOOMSH_LINK_OPTIONS)
+ $(LINK_LIBS)
+ $(IMPLIB)
+ $(YAZ_ZOOMTST7_OBJS)
+ /pdb:"$(LIBDIR)\zoomtst7.pdb"
+ /map:"$(LIBDIR)\zoomtst7.map"
+ /out:$(ZOOMTST7)
+<<
+
$(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(DLL)
@echo Linking the ztest $(ZTEST)
$(LINK) @<<
############## clean
clean:
- del $(DLL)
- del $(CLIENT)
- del $(ZTEST)
+ del $(BINDIR)\*.exe
+ del $(BINDIR)\*.dll
del $(TMPDIR)\*.
del $(LIBDIR)\*.MAP
del $(LIBDIR)\*.LIB
del $(OBJDIR)\*.OBJ
- del $(PROTOH)
-
realclean: clean
del $(Z3950_C_DIR)\*.c
del $(Z3950_C_DIR)\*.h
############### Explicit dependencies
###########################################################
-$(ALL_OBJS): $(PROTOH)
-
# force recompilation of everything, if makefile changed
$(Z3950_OBJS): $(GENERATED_C_FILES) $(GENERATED_H_FILES)
$(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
-!if $(NEW_Z3950)
-$(PROTOH): $(GENERATED_C_FILES) $(GENERATED_H_FILES)
-!endif
# makes sure we generate before compiling anything, as the
# new proto.h refers to the generated files, and is included
# in various places
###########################################################
#
# $Log: makefile,v $
-# Revision 1.17 2000-10-06 12:01:12 adam
+# Revision 1.28 2001-10-25 10:45:08 adam
+# Fixed make clean.
+#
+# Revision 1.27 2001/10/24 12:24:43 adam
+# WIN32 updates: ZOOM runs, nmem_init/nmem_exit called in DllMain.
+#
+# Revision 1.26 2001/09/27 12:09:18 adam
+# Function nmem_exit calls oid_exit (when reference is 0).
+#
+# Revision 1.25 2001/09/24 21:51:56 adam
+# New Z39.50 OID utilities: yaz_oidval_to_z3950oid, yaz_str_to_z3950oid
+# and yaz_z3950oid_to_str.
+#
+# 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