-# Makefile.mak - makefile for MS NMAKE
-# $Id: makefile,v 1.10 1999-12-08 13:10:48 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
default: all
-all: dirs proto_h dll client server ztest
+all: dirs yaz_date_h proto_h dll client ztest
generate: generated_files
ZUTILDIR=$(SRCDIR)\ZUTIL
RETDIR=$(SRCDIR)\RETRIEVAL
Z3950DIR=$(SRCDIR)\Z39.50
+ILLDIR=$(SRCDIR)\ill
+CCLDIR=$(SRCDIR)\ccl
CLIENTDIR=$(SRCDIR)\CLIENT
SERVERDIR=$(SRCDIR)\SERVER
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
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 \
ZTEST_LINK_OPTIONS = /subsystem:console
# TCL
-TCL="C:\Program Files\Tcl\bin\tclsh80.exe"
+TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
+HAVE_TCL=1
-COMMON_TCL_OPTIONS= ..\util\yc.tcl -d z.tcl -I$(INCLDIR) -i yaz
+COMMON_TCL_OPTIONS= ..\util\yaz-comp -I$(INCLDIR) -i yaz
# Final opt variables
!if $(DEBUG)
# need to be specified, though
YAZ_CLIENT_OBJS= \
- $(OBJDIR)\client.obj
+ $(OBJDIR)\client.obj \
+ $(OBJDIR)\admin.obj
YAZ_SERVER_OBJS= \
"$(OBJDIR)\eventl.obj" \
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)\odr_null.obj \
$(OBJDIR)\odr_oct.obj \
$(OBJDIR)\odr_oid.obj \
- $(OBJDIR)\odr_priv.obj \
$(OBJDIR)\odr_seq.obj \
$(OBJDIR)\odr_tag.obj \
$(OBJDIR)\odr_use.obj \
$(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\
$(OBJDIR)\d1_sutrs.obj\
$(OBJDIR)\d1_tagset.obj\
$(OBJDIR)\d1_varset.obj\
- $(OBJDIR)\d1_write.obj
+ $(OBJDIR)\d1_write.obj\
+ $(OBJDIR)\d1_if.obj
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 \
$(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\
+ $(OBJDIR)\ill-core.obj\
+ $(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) \
- $(Z3950_OBJS)
+ $(Z3950_OBJS) \
+ $(ILL_OBJS)
!else
YAZ_OBJS= \
$(COMMON_YAZ_OBJS) \
ALL_OBJS= \
$(YAZ_OBJS) \
$(YAZ_CLIENT_OBJS) \
- $(YAZ_SERVER_OBJS) \
$(ZTEST_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)
#!!! Should be moved to OBJ, but that requires too much trickery
# Files generated from datetime.asn
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 \
$(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)
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
###########################################################
# 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) $<
+{$(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) z3950v3.asn
+ $(TCL) $(TCLOPT) -d z.tcl z3950v3.asn
@cd $(WINDIR)
$(DATETIME_FILES): $(Z3950DIR)\datetime.asn
@cd $(Z3950DIR)
- $(TCL) $(TCLOPT) datetime.asn
+ $(TCL) $(TCLOPT) -d z.tcl datetime.asn
@cd $(WINDIR)
$(UNIVRES_FILES): $(Z3950DIR)\univres.asn
@cd $(Z3950DIR)
- $(TCL) $(TCLOPT) univres.asn
+ $(TCL) $(TCLOPT) -d z.tcl univres.asn
@cd $(WINDIR)
$(ESUPDATE_FILES): $(Z3950DIR)\esupdate.asn
@cd $(Z3950DIR)
- $(TCL) $(TCLOPT) 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
+ @cd $(WINDIR)
+
+$(ITEM_REQ_FILES): $(ILLDIR)\item-req.asn
+ @cd $(ILLDIR)
+ $(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)
$(CLIENT_LINK_OPTIONS)
$(LINK_LIBS)
$(IMPLIB)
- $(YAZ_CLIENT_OBJS)\r
- /pdb:"$(LIBDIR)/yaz-client.pdb"\r
- /map:"$(LIBDIR)/yaz-client.map"
+ $(YAZ_CLIENT_OBJS)
+ /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)
$(LINK_LIBS)
shell32.lib
$(IMPLIB)
- $(SERVER)
- $(ZTEST_OBJS) \r
- /implib:"$(LIBDIR)/yaz-ztest.lib"\r
- /pdb:"$(LIBDIR)/yaz-ztest.pdb"\r
- /map:"$(LIBDIR)/yaz-ztest.map"
+ $(ZTEST_OBJS)
+ /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
###########################################################
clean:
del $(DLL)
del $(CLIENT)
- del $(SERVER)
del $(ZTEST)
- del $(TMPDIR)\*.\r
- del $(LIBDIR)\*.MAP\r
+ del $(TMPDIR)\*.
+
+ del $(LIBDIR)\*.MAP
+
del $(LIBDIR)\*.LIB
- del $(OBJDIR)\*.OBJ\r
+ del $(OBJDIR)\*.OBJ
+
del $(PROTOH)
realclean: clean
############### Explicit dependencies
###########################################################
-$(ALL_OBJS): makefile $(PROTOH)
+$(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
###########################################################
#
# $Log: makefile,v $
-# Revision 1.10 1999-12-08 13:10:48 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
+# Updated for ILL.
+#
+# Revision 1.11 1999/12/21 14:16:20 ian
+# Changed retrieval module to allow data1 trees with no associated absyn.
+# Also added a simple interface for extracting values from data1 trees using
+# a string based tagpath.
+#
+# Revision 1.10 1999/12/08 13:10:48 adam
# New version.
#
# Revision 1.9 1999/11/30 13:47:12 adam
projects / yaz-moved-to-github.git / blobdiff