# Makefile.mak - makefile for MS NMAKE
-# $Id: makefile,v 1.7 1999-06-09 15:10:08 heikki Exp $
+# $Id: makefile,v 1.14 2000-03-02 08:48:21 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)
ZUTILDIR=$(SRCDIR)\ZUTIL
RETDIR=$(SRCDIR)\RETRIEVAL
Z3950DIR=$(SRCDIR)\Z39.50
+ILLDIR=$(SRCDIR)\ill
CLIENTDIR=$(SRCDIR)\CLIENT
SERVERDIR=$(SRCDIR)\SERVER
DLL=$(BINDIR)\Yaz.dll
IMPLIB=$(LIBDIR)\Yaz.lib
-CLIENT=$(BINDIR)\client.exe
+CLIENT=$(BINDIR)\yaz-client.exe
SERVER=$(LIBDIR)\server.lib
-ZTEST=$(BINDIR)\ztest.exe
-PROTOH=$(INCLDIR)\proto.h
+ZTEST=$(BINDIR)\yaz-ztest.exe
+PROTOH=$(INCLDIR)\yaz\proto.h
# shortcut names defined here
dll : $(DLL)
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"
+COMMON_TCL_OPTIONS= ..\util\yaz-comp -I$(INCLDIR) -i yaz
# Final opt variables
!if $(DEBUG)
$(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)\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)\zes-pset.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) \
!if $(NEW_Z3950)
YAZ_OBJS= \
$(COMMON_YAZ_OBJS) \
+ $(ILL_OBJS) \
$(Z3950_OBJS)
!else
YAZ_OBJS= \
##########################################################
!if $(NEW_Z3950)
-$(PROTOH): makefile $(INCLDIR)\z-proto.h
- type $(INCLDIR)\z-proto.h > $(INCLDIR)\proto.h
+$(PROTOH): makefile $(INCLDIR)\yaz\z-proto.h
+ type $(INCLDIR)\yaz\z-proto.h > $(PROTOH)
!else
-$(PROTOH): makefile $(INCLDIR)\prt-proto.h
- type $(INCLDIR)\prt-proto.h > $(INCLDIR)\proto.h
+$(PROTOH): makefile $(INCLDIR)\yaz\prt-proto.h
+ type $(INCLDIR)\yaz\prt-proto.h > $(PROTOH)
!endif
###########################################################
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)\z-date.h
+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 = $(INCLDIR)\z-univ.h
+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 = $(INCLDIR)\zes-update.h
+ESUPDATE_H_FILES = $(INCLDIR)\yaz\zes-update.h
ESUPDATE_C_FILES = $(Z3950_C_DIR)\zes-update.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-pset.c \
$(Z3950_C_DIR)\zes-update0.c
+ILL_CORE_H_FILES= \
+ $(INCLDIR)\yaz\ill-core.h
+
+ILL_CORE_C_FILES= \
+ $(ILL_C_DIR)\ill-core.c
+
+ITEM_REQ_H_FILES= \
+ $(INCLDIR)\yaz\item-req.h
+
+ITEM_REQ_C_FILES= \
+ $(ILL_C_DIR)\item-req.c
+
DATETIME_FILES = $(DATETIME_H_FILES) $(DATETIME_C_FILES)
UNIVRES_FILES = $(UNIVRES_H_FILES) $(UNIVRES_C_FILES)
ESUPDATE_FILES = $(ESUPDATE_H_FILES) $(ESUPDATE_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) \
# 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:
{$(Z3950_C_DIR)}.c{$(OBJDIR)}.obj:
@$(CPP) $(COPT) $<
+{$(ILL_C_DIR)}.c{$(OBJDIR)}.obj:
+ @$(CPP) $(COPT) $<
############### ASN-generated files
$(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)
+
+$(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)
###########################################################
$(DLL_LINK_OPTIONS)
$(DLL_OBJS)
/out:$(DLL)
- /implib:$(IMPLIB)
+ /implib:"$(LIBDIR)/yaz.lib"
/pdb:"$(LIBDIR)/yaz.pdb"
/map:"$(LIBDIR)/yaz.map"
<<
$(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)
$(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)
<<
############## 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)\z-accdes1.h
- del $(INCLDIR)\z-core.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)
$(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.7 1999-06-09 15:10:08 heikki
+# 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
projects / yaz-moved-to-github.git / blobdiff