-# Makefile.mak - makefile for MS NMAKE
-# $Id: makefile,v 1.5 1999-06-09 11:05:30 heikki Exp $
+# makefile.mak - makefile for MS NMAKE
+# $Id: makefile,v 1.19 2000-11-16 13:03:13 adam Exp $
#
# Programmed by
# HL: Heikki Levanto, Index Data
DEBUG=0 # 0 for release, 1 for debug
-NEW_Z3950=0 # 0= use old asn files
+NEW_Z3950=1 # 0= use old asn files
# 1= generate files from *.asn (needs tcl)
default: all
-all: dirs proto_h dll client server ztest
+all: dirs proto_h dll client ztest
+generate: generated_files
###########################################################
############### Directories
ZUTILDIR=$(SRCDIR)\ZUTIL
RETDIR=$(SRCDIR)\RETRIEVAL
Z3950DIR=$(SRCDIR)\Z39.50
+ILLDIR=$(SRCDIR)\ill
+CCLDIR=$(SRCDIR)\ccl
CLIENTDIR=$(SRCDIR)\CLIENT
SERVERDIR=$(SRCDIR)\SERVER
DLL=$(BINDIR)\Yaz.dll
IMPLIB=$(LIBDIR)\Yaz.lib
-CLIENT=$(BINDIR)\client.exe
-SERVER=$(LIBDIR)\server.lib
-ZTEST=$(BINDIR)\ztest.exe
-PROTOH=$(INCLDIR)\proto.h
+CLIENT=$(BINDIR)\yaz-client.exe
+ZTEST=$(BINDIR)\yaz-ztest.exe
+PROTOH=$(INCLDIR)\yaz\proto.h
# shortcut names defined here
dll : $(DLL)
client: $(CLIENT)
-server: $(SERVER)
ztest: $(ZTEST)
proto_h: $(PROTOH)
COMMON_C_OPTIONS= \
/nologo /W3 /GX /FD /c \
/D "WIN32" /D "_WINDOWS" \
+ /D "CCL2RPN=1" \
/FR"$(OBJDIR)\\" \
/Fo"$(OBJDIR)\\" \
/Fd"$(OBJDIR)\\"
# /Zi = Program database for debuggers
# /ZI = Pgm database with special "edit&continue" stuff - not available in C5
-### 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"
-
### Linker options
LINK=link.exe
ZTEST_LINK_OPTIONS = /subsystem:console
# TCL
-TCL="C:\Program Files\Tcl\bin\tclsh80.exe"
-
-COMMON_TCL_OPTIONS= ..\util\yc.tcl -d z.tcl -I $(INCLDIR)
+TCL="C:\Program Files\Tcl\bin\tclsh82.exe"
+HAVE_TCL=1
+COMMON_TCL_OPTIONS= ..\util\yaz-comp -I$(INCLDIR) -i yaz
# Final opt variables
!if $(DEBUG)
############### Source and object modules
###########################################################
-# The resource files
-
-RCFILE=$(SRCDIR)\compmak.rc
-# Horrible Hack: The resfile contains just one line, pointing
-# to the component.tlb file (which is created by the idl compiler)
-# Devstudio wants that file to live in YazX3950, this makefile in
-# win/obj. So we need to RC files!
-
-RESFILE=$(OBJDIR)\component.res
-
-
-# The def file
-#DEF_FILE= $(ROOTDIR)\component.def
-
-
-
# Note: Ordinary source files are not specified here at
# all, make finds them in suitable dirs. The object modules
# 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 \
YAZ_UTIL_OBJS= \
$(OBJDIR)\atoin.obj \
- $(OBJDIR)\dmalloc.obj \
$(OBJDIR)\log.obj \
$(OBJDIR)\marcdisp.obj \
$(OBJDIR)\nmem.obj \
$(OBJDIR)\yaz-ccl.obj \
$(OBJDIR)\otherinfo.obj
-# $(OBJDIR)\query.obj \
-
-
YAZ_RET_OBJS= \
$(OBJDIR)\d1_absyn.obj\
$(OBJDIR)\d1_attset.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) \
DLL_OBJS= $(YAZ_OBJS)
+ALL_OBJS= \
+ $(YAZ_OBJS) \
+ $(YAZ_CLIENT_OBJS) \
+ $(ZTEST_OBJS)
##########################################################
##########################################################
!if $(NEW_Z3950)
-$(PROTOH): makefile $(INCLDIR)\z-proto.h
- copy $(INCLDIR)\z-proto.h $(INCLDIR)\proto.h
-!else
-$(PROTOH): makefile $(INCLDIR)\prt-proto.h
- copy $(INCLDIR)\prt-proto.h $(INCLDIR)\proto.h
+$(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) #!!! Should be moved to OBJ
-# Files generated from datetime.asn
-DATETIME_H_FILES = z-date.h
-DATETIME_C_FILES = z-date.c
-DATETIME_FILES = $(DATETIME_H_FILES) $(DATETIME_C_FILES)
-$(DATETIME_C_FILES): $(DATETIME_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
+DATETIME_H_FILES = $(INCLDIR)\yaz\z-date.h
+DATETIME_C_FILES = $(Z3950_C_DIR)\z-date.c
# Files generated from univres.asn
-UNIVRES_H_FILES = z-univ.h
-UNIVRES_C_FILES = z-univ.c
-UNIVRES_FILES = $(UNIVRES_H_FILES) $(UNIVRES_C_FILES)
-$(UNIVRES_C_FILES): $(UNIVRES_H_FILES)
+UNIVRES_H_FILES = $(INCLDIR)\yaz\z-univ.h
+UNIVRES_C_FILES = $(Z3950_C_DIR)\z-univ.c
# Files generated from esupdate.asn
-ESUPDATE_H_FILES = zes-update.h
-ESUPDATE_C_FILES = zes-update.c
-ESUPDATE_FILES = $(ESUPDATE_H_FILES) $(ESUPDATE_C_FILES)
-$(ESUPDATE_C_FILES): $(ESUPDATE_H_FILES)
+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)\z-accdes1.h \
- $(INCLDIR)\z-core.h
+ $(INCLDIR)\yaz\z-accdes1.h \
+ $(INCLDIR)\yaz\z-core.h
Z3950V3_C_FILES= \
$(Z3950_C_DIR)\z-accdes1.c \
$(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
-Z3950V3_FILES= $(Z3950V3_C_FILES) $(Z3950V3_H_FILES)
+# Files generated from ill9702.asn
+ILL_CORE_H_FILES= \
+ $(INCLDIR)\yaz\ill-core.h
+
+ILL_CORE_C_FILES= \
+ $(ILL_C_DIR)\ill-core.c
-$(Z3950V3_C_FILES): $(Z3950V3_H_FILES)
+# 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)
###########################################################
# DLL sources
{$(SRCDIR)}.cpp{$(OBJDIR)}.obj:
- @$(CPP) @<<
- $(COPT) $<
-<<
+ @$(CPP) $(COPT) $<
# Yaz client
{$(CLIENTDIR)}.c{$(OBJDIR)}.obj:
- @$(CPP) @<<
- $(COPT) $<
- /D"_CONSOLE"
-<<
+ @$(CPP) $(COPT) $< /D"_CONSOLE"
# Ztest
{$(ZTESTDIR)}.c{$(OBJDIR)}.obj:
- @$(CPP) @<<
- $(COPT) $<
- /D"_CONSOLE"
- /D"_MBCS"
-<<
-
+ @$(CPP) $(COPT) $< /D"_CONSOLE"
# 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) $<
-### Resource file
-$(RESFILE): $(RCFILE) $(IDLGENERATED)
- $(RSC) $(RCOPT) /fo"$(RESFILE)" $(RCFILE)
+{$(CCLDIR)}.c{$(OBJDIR)}.obj:
+ $(CPP) $(COPT) $<
############### ASN-generated files
+!if $(HAVE_TCL)
$(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
###########################################################
############### Linking
###########################################################
-###$(DLL) $(IMPLIB): "$(BINDIR)" $(Z3950_OBJS)
-
$(DLL) $(IMPLIB): "$(BINDIR)" $(DLL_OBJS)
@echo Linking the dll $(DLL)
$(LINK) @<<
$(DLL_LINK_OPTIONS)
$(DLL_OBJS)
/out:$(DLL)
- /implib:$(IMPLIB)
- /pdb:"$(LIBDIR)/yaz.pdb"
- /map:"$(LIBDIR)/yaz.map"
+ /implib:"$(LIBDIR)\yaz.lib"
+ /pdb:"$(LIBDIR)\yaz.pdb"
+ /map:"$(LIBDIR)\yaz.map"
<<
-#foo:
-# rem $(Z3950_OBJS)
-# pause
-# rem $(DLL_OBJS)
-
-foo: $(OBJDIR)\comstack.obj
- echo foo
-
-
$(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS)
@echo Linking the client $(CLIENT)
$(LINK) @<<
- $(LNKOPT)
+ $(LNKOPT)
$(CLIENT_LINK_OPTIONS)
$(LINK_LIBS)
$(IMPLIB)
- $(YAZ_CLIENT_OBJS)
- /out:$(CLIENT)
+ $(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)
+ $(LNKOPT)
$(ZTEST_LINK_OPTIONS)
$(LINK_LIBS)
- shell32.lib
+ shell32.lib
$(IMPLIB)
- $(SERVER)
$(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)
-<<
-
-# $(LINK_LIBS)
-
# note that this links a lib, so it uses completely different options.
-
-
###########################################################
############### Special operations
###########################################################
############## clean
clean:
- del $(OBJDIR)\*.obj
- del $(OBJDIR)\*.sbr
del $(DLL)
del $(CLIENT)
- del $(SERVER)
del $(ZTEST)
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
+ del $(INCLDIR)\yaz\z-accdes1.h
+ del $(INCLDIR)\yaz\z-core.h
+ del $(DATETIME_H_FILES)
+ del $(UNIVRES_H_FILES)
+ del $(ESUPDATE_H_FILES)
+
+# Because DOS del will only accept one file name to delete,
+# the _H_ files work only on sets that have just one file.
+# Z3950_H_FILES had to be spelled out. One more point for MS!
########### check directories and create if needed
dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR)
############### Explicit dependencies
###########################################################
-$(DLL_OBJS): makefile $(PROTOH) $(GENERATED_C_FILES)
+$(ALL_OBJS): $(PROTOH)
-# Note: The objects depend on their own C file already, the
-# dependency here is actually to make sure we get the
-# proper H files generated before trying to compile anything
-# Unfortunately make clean can not delete the H files so
-# easily. This hack assures that if the C's are deleted
-# (as make clean does), the H's will be generated anew...
+# 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
###########################################################
#
# $Log: makefile,v $
-# Revision 1.5 1999-06-09 11:05:30 heikki
+# 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
+# Improved installation. Moved header files to include/yaz.
+#
+# Revision 1.8 1999/07/21 08:48:02 adam
+# Removed dmalloc.obj.
+#
+# Revision 1.7 1999/06/09 15:10:08 heikki
+# Cleaning up. Seems to work all right
+#
+# Revision 1.6 1999/06/09 13:33:32 heikki
+# Compiles and links both old and new type stuff all right
+#
+# Revision 1.5 1999/06/09 11:05:30 heikki
# At least it can compile
#
# Revision 1.4 1999/06/09 09:41:09 heikki
projects / yaz-moved-to-github.git / blobdiff