# Makefile.mak - makefile for MS NMAKE
-# $Id: makefile,v 1.13 2000-02-28 11:13:03 adam Exp $
+# $Id: makefile,v 1.16 2000-05-05 13:48:15 adam Exp $
#
# Programmed by
# HL: Heikki Levanto, Index Data
############### Parameters
###########################################################
-DEBUG=0 # 0 for release, 1 for debug
+DEBUG=1 # 0 for release, 1 for debug
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
IMPLIB=$(LIBDIR)\Yaz.lib
CLIENT=$(BINDIR)\yaz-client.exe
-SERVER=$(LIBDIR)\server.lib
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)
# TCL
TCL="C:\Program Files\Tcl\bin\tclsh82.exe"
+HAVE_TCL=0
-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)
# 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_ASN_OBJS= \
$(OBJDIR)\proto.obj \
$(OBJDIR)\zes-pquery.obj \
$(OBJDIR)\zes-psched.obj \
$(OBJDIR)\zes-pset.obj \
- $(OBJDIR)\zes-update0.obj
+ $(OBJDIR)\zes-update0.obj \
+ $(OBJDIR)\zes-admin.obj
ILL_OBJS= \
$(OBJDIR)\ill-get.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_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) \
ALL_OBJS= \
$(YAZ_OBJS) \
$(YAZ_CLIENT_OBJS) \
- $(YAZ_SERVER_OBJS) \
$(ZTEST_OBJS)
############### Generated C and H files
###########################################################
+
Z3950_C_DIR=$(Z3950DIR)
ILL_C_DIR=$(ILLDIR)
#!!! Should be moved to OBJ, but that requires too much trickery
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 \
+ $(Z3950_C_DIR)\zes-admin.c
ILL_CORE_H_FILES= \
$(INCLDIR)\yaz\ill-core.h
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) \
$(PROTOH)
+
###########################################################
############### Compiling
###########################################################
############### ASN-generated files
+!if $(HAVE_TCL)
+
$(Z3950V3_FILES): $(Z3950DIR)\z3950v3.asn
@cd $(Z3950DIR)
$(TCL) $(TCLOPT) -d z.tcl z3950v3.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
$(TCL) $(TCLOPT) -d ill.tcl item-req.asn
@cd $(WINDIR)
+!endif
+
###########################################################
############### Linking
###########################################################
$(DLL_LINK_OPTIONS)
$(DLL_OBJS)
/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)
$(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)
$(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
###########################################################
clean:
del $(DLL)
del $(CLIENT)
- del $(SERVER)
del $(ZTEST)
del $(TMPDIR)\*.
############### Explicit dependencies
###########################################################
-$(ALL_OBJS): makefile $(PROTOH)
+$(ALL_OBJS): $(PROTOH)
# force recompilation of everything, if makefile changed
###########################################################
#
# $Log: makefile,v $
-# Revision 1.13 2000-02-28 11:13:03 adam
+# 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