# makefile.mak - makefile for MS NMAKE
-# $Id: makefile,v 1.20 2000-12-01 17:56:41 adam Exp $
+# $Id: makefile,v 1.26 2001-09-27 12:09:18 adam Exp $
#
# Programmed by
# HL: Heikki Levanto, Index Data
default: all
-all: dirs proto_h dll client ztest
+all: dirs yaz_date_h proto_h dll client ztest
generate: generated_files
CLIENT=$(BINDIR)\yaz-client.exe
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)
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)\\" \
ZTEST_LINK_OPTIONS = /subsystem:console
# TCL
-TCL="C:\Program Files\Tcl\bin\tclsh82.exe"
+TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
HAVE_TCL=1
COMMON_TCL_OPTIONS= ..\util\yaz-comp -I$(INCLDIR) -i yaz
$(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\
##########################################################
!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
+$(PROTOH): $(INCLDIR)\yaz\prt-proto.h
copy $(ASNDIR)\*.h $(INCLDIR)\yaz
type $(INCLDIR)\yaz\prt-proto.h > $(PROTOH)
!endif
!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"
###########################################################
#
# $Log: makefile,v $
-# Revision 1.20 2000-12-01 17:56:41 adam
+# 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