-# Makefile.mak - makefile for MS NMAKE
-# $Id: makefile,v 1.13 2000-02-28 11:13:03 adam Exp $
+# makefile.mak - makefile for MS NMAKE
+# $Id: makefile,v 1.54 2003-02-18 09:11:50 adam Exp $
#
# Programmed by
# HL: Heikki Levanto, Index Data
# for you. You can find this somewhere near DevStudio\VC\BIN
# - RegSvr32 must also be along the path, often in WINDOWS\SYSTEM
# - TCL has to be available too, if compiling for NEW_Z3950
+# - You may have to edit the path to tcl below
###########################################################
############### Parameters
DEBUG=0 # 0 for release, 1 for debug
-NEW_Z3950=1 # 0= use old asn files
- # 1= generate files from *.asn (needs tcl)
+# TCL
+#TCL="C:\Tcl\bin\tclsh83.exe"
+TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
+HAVE_TCL=1
+
+# iconv charcter conversion utility
+HAVE_ICONV=1
+ICONV_DIR = c:\iconv-1.8.win32
+
+# libxml2
+HAVE_LIBXML2=1
+LIBXML2_DIR=c:\libxml2-2.5.3.win32
+# WIN32 binaries libxml2 & iconv from here:
+# http://www.zlatkovic.com/projects/libxml/binaries.html
default: all
-all: dirs proto_h dll client server ztest
+all: dirs generate dll client ztest zoomsh iconv libxml2
+
+NSIS="c:\program files\nsis\makensis-bz2.exe"
+
+nsis: all
+ $(NSIS) yaz.nsi
+
+nsishelp:
+ $(NSIS)
generate: generated_files
RETDIR=$(SRCDIR)\RETRIEVAL
Z3950DIR=$(SRCDIR)\Z39.50
ILLDIR=$(SRCDIR)\ill
+CCLDIR=$(SRCDIR)\ccl
+ZOOMDIR=$(SRCDIR)\zoom
CLIENTDIR=$(SRCDIR)\CLIENT
SERVERDIR=$(SRCDIR)\SERVER
############### Targets - what to make
###########################################################
-
DLL=$(BINDIR)\Yaz.dll
IMPLIB=$(LIBDIR)\Yaz.lib
CLIENT=$(BINDIR)\yaz-client.exe
-SERVER=$(LIBDIR)\server.lib
+ZOOMSH=$(BINDIR)\zoomsh.exe
ZTEST=$(BINDIR)\yaz-ztest.exe
-PROTOH=$(INCLDIR)\yaz\proto.h
+
+ZOOMTST1=$(BINDIR)\zoomtst1.exe
+ZOOMTST2=$(BINDIR)\zoomtst2.exe
+ZOOMTST3=$(BINDIR)\zoomtst3.exe
+ZOOMTST4=$(BINDIR)\zoomtst4.exe
+ZOOMTST5=$(BINDIR)\zoomtst5.exe
+ZOOMTST6=$(BINDIR)\zoomtst6.exe
+ZOOMTST7=$(BINDIR)\zoomtst7.exe
+ZOOMTST8=$(BINDIR)\zoomtst8.exe
# shortcut names defined here
dll : $(DLL)
client: $(CLIENT)
-server: $(SERVER)
ztest: $(ZTEST)
-proto_h: $(PROTOH)
+
+zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
+ $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8)
###########################################################
############### Compiler and linker options
###########################################################
+!if $(HAVE_ICONV)
+ICONV_DEF= \
+ /D HAVE_ICONV_H=1 \
+ /I"$(ICONV_DIR)\include"
+ICONV_LIB= \
+ $(ICONV_DIR)\lib\iconv.lib
+iconv: $(BINDIR)\iconv.dll
+
+$(BINDIR)\iconv.dll:
+ copy $(ICONV_DIR)\lib\iconv.dll $(BINDIR)
+!else
+ICONV_DEF= \
+ /D HAVE_ICONV_H=0
+ICONV_LIB=
+iconv:
+
+!endif
+
+!if $(HAVE_LIBXML2)
+LIBXML2_LIB=$(LIBXML2_DIR)\lib\libxml2.lib
+LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
+libxml2: $(BINDIR)\libxml2.dll
+
+$(BINDIR)\libxml2.dll:
+ copy $(LIBXML2_DIR)\lib\libxml2.dll $(BINDIR)
+!else
+LIBXML2_LIB=
+LIBXML2_DEF=/D HAVE_XML2=0
+libxml2:
+
+!endif
+
### C and CPP compiler (the same thing)
# Note: $(CPP) has already been defined in the environment
COMMON_C_OPTIONS= \
/nologo /W3 /GX /FD /c \
- /D "WIN32" /D "_WINDOWS" \
+ $(ICONV_DEF) \
+ $(LIBXML2_DEF) \
+ /D "_WINDOWS" \
+ /D "WIN32" \
+ /D "HAVE_WCHAR_H=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 \
- wsock32.lib advapi32.lib
+LINK_LIBS= kernel32.lib user32.lib gdi32.lib \
+ advapi32.lib uuid.lib \
+ wsock32.lib advapi32.lib \
+ $(ICONV_LIB) $(LIBXML2_LIB)
COMMON_LNK_OPTIONS= /nologo \
/subsystem:windows \
DLL_LINK_OPTIONS= /dll
CLIENT_LINK_OPTIONS = /subsystem:console
+ZOOMSH_LINK_OPTIONS = /subsystem:console
SERVER_LINK_OPTIONS = -lib
ZTEST_LINK_OPTIONS = /subsystem:console
-# TCL
-TCL="C:\Program Files\Tcl\bin\tclsh82.exe"
-
-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)\tabcomplete.obj \
+ $(OBJDIR)\admin.obj
+
+YAZ_ZOOMSH_OBJS = \
+ $(OBJDIR)\zoomsh.obj
+
+YAZ_ZOOMTST1_OBJS = \
+ $(OBJDIR)\zoomtst1.obj
+YAZ_ZOOMTST2_OBJS = \
+ $(OBJDIR)\zoomtst2.obj
+YAZ_ZOOMTST3_OBJS = \
+ $(OBJDIR)\zoomtst3.obj
+YAZ_ZOOMTST4_OBJS = \
+ $(OBJDIR)\zoomtst4.obj
+YAZ_ZOOMTST5_OBJS = \
+ $(OBJDIR)\zoomtst5.obj
+YAZ_ZOOMTST6_OBJS = \
+ $(OBJDIR)\zoomtst6.obj
+YAZ_ZOOMTST7_OBJS = \
+ $(OBJDIR)\zoomtst7.obj
+YAZ_ZOOMTST8_OBJS = \
+ $(OBJDIR)\zoomtst8.obj
YAZ_SERVER_OBJS= \
"$(OBJDIR)\eventl.obj" \
"$(OBJDIR)\tcpdchk.obj"
ZTEST_OBJS= \
+ "$(OBJDIR)\read-marc.obj" \
"$(OBJDIR)\read-grs.obj" \
"$(OBJDIR)\ztest.obj"
-
-
-YAZ_ASN_OBJS= \
- $(OBJDIR)\proto.obj \
- $(OBJDIR)\prt-acc.obj \
- $(OBJDIR)\prt-add.obj \
- $(OBJDIR)\prt-arc.obj \
- $(OBJDIR)\prt-dat.obj \
- $(OBJDIR)\prt-dia.obj \
- $(OBJDIR)\prt-esp.obj \
- $(OBJDIR)\prt-exd.obj \
- $(OBJDIR)\prt-exp.obj \
- $(OBJDIR)\prt-grs.obj \
- $(OBJDIR)\prt-rsc.obj \
- $(OBJDIR)\prt-univ.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_COMSTACK_OBJS= \
$(OBJDIR)\comstack.obj \
$(OBJDIR)\tpath.obj \
$(OBJDIR)\wrbuf.obj \
$(OBJDIR)\xmalloc.obj \
- $(OBJDIR)\matchstr.obj
+ $(OBJDIR)\matchstr.obj \
+ $(OBJDIR)\siconv.obj \
+ $(OBJDIR)\marc8.obj
YAZ_ZUTIL_OBJS= \
$(OBJDIR)\diagbib1.obj \
$(OBJDIR)\zget.obj \
- $(OBJDIR)\prt-ext.obj \
$(OBJDIR)\logrpn.obj \
$(OBJDIR)\pquery.obj \
$(OBJDIR)\yaz-ccl.obj \
- $(OBJDIR)\otherinfo.obj
-
-YAZ_RET_OBJS= \
- $(OBJDIR)\d1_absyn.obj\
- $(OBJDIR)\d1_attset.obj\
- $(OBJDIR)\d1_doespec.obj\
- $(OBJDIR)\d1_espec.obj\
- $(OBJDIR)\d1_expout.obj\
- $(OBJDIR)\d1_grs.obj\
- $(OBJDIR)\d1_handle.obj\
- $(OBJDIR)\d1_map.obj\
- $(OBJDIR)\d1_marc.obj\
- $(OBJDIR)\d1_prtree.obj\
- $(OBJDIR)\d1_read.obj\
- $(OBJDIR)\d1_soif.obj\
- $(OBJDIR)\d1_sumout.obj\
- $(OBJDIR)\d1_sutrs.obj\
- $(OBJDIR)\d1_tagset.obj\
- $(OBJDIR)\d1_varset.obj\
- $(OBJDIR)\d1_write.obj\
- $(OBJDIR)\d1_if.obj
+ $(OBJDIR)\otherinfo.obj \
+ $(OBJDIR)\sortspec.obj \
+ $(OBJDIR)\z3950oid.obj \
+ $(OBJDIR)\charneg.obj \
+ $(OBJDIR)\grs1disp.obj \
+ $(OBJDIR)\zgdu.obj \
+ $(OBJDIR)\soap.obj \
+ $(OBJDIR)\srw.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 \
+ $(OBJDIR)\prt-ext.obj \
+ $(OBJDIR)\z-charneg.obj \
+ $(OBJDIR)\z-mterm2.obj
ILL_OBJS= \
$(OBJDIR)\ill-get.obj\
$(OBJDIR)\ill-core.obj\
$(OBJDIR)\item-req.obj
+YAZ_ZOOM_OBJS = \
+ $(OBJDIR)\zoom-c.obj \
+ $(OBJDIR)\zoom-opt.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_SERVER_OBJS) \
+ $(YAZ_ZOOM_OBJS)
-!if $(NEW_Z3950)
YAZ_OBJS= \
- $(COMMON_YAZ_OBJS) \
+ $(Z3950_OBJS) \
$(ILL_OBJS) \
- $(Z3950_OBJS)
-!else
-YAZ_OBJS= \
- $(COMMON_YAZ_OBJS) \
- $(YAZ_ASN_OBJS)
-!endif
+ $(COMMON_YAZ_OBJS)
DLL_OBJS= $(YAZ_OBJS)
ALL_OBJS= \
$(YAZ_OBJS) \
$(YAZ_CLIENT_OBJS) \
- $(YAZ_SERVER_OBJS) \
$(ZTEST_OBJS)
-
-##########################################################
-############## proto.h
-##########################################################
-
-!if $(NEW_Z3950)
-$(PROTOH): makefile $(INCLDIR)\yaz\z-proto.h
- type $(INCLDIR)\yaz\z-proto.h > $(PROTOH)
-!else
-$(PROTOH): makefile $(INCLDIR)\yaz\prt-proto.h
- type $(INCLDIR)\yaz\prt-proto.h > $(PROTOH)
-!endif
-
-
###########################################################
############### Generated C and H files
-###########################################################
+#####
+######################################################
Z3950_C_DIR=$(Z3950DIR)
ILL_C_DIR=$(ILLDIR)
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 generated from esadmin.asn
+CHARNEG_H_FILES = $(INCLDIR)\yaz\z-charneg.h
+CHARNEG_C_FILES = $(Z3950_C_DIR)\z-charneg.c
+
+# Files generated from mterm2.asn
+MTERM2_H_FILES = $(INCLDIR)\yaz\z-mterm2.h
+MTERM2_C_FILES = $(Z3950_C_DIR)\z-mterm2.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)
+CHARNEG_FILES = $(CHARNEG_C_FILES) $(CHARNEG_H_FILES)
+MTERM2_FILES = $(MTERM2_C_FILES) $(MTERM2_H_FILES)
GENERATED_C_FILES= \
$(Z3950V3_C_FILES) \
$(ESUPDATE_C_FILES) \
$(UNIVRES_C_FILES) \
- $(DATETIME_C_FILES)
+ $(DATETIME_C_FILES) \
+ $(ESADMIN_C_FILES) \
+ $(CHARNEG_C_FILES) \
+ $(MTERM2_C_FILES)
GENERATED_H_FILES= \
$(Z3950V3_H_FILES) \
$(ESUPDATE_H_FILES) \
$(UNIVRES_H_FILES) \
- $(DATETIME_H_FILES)
+ $(DATETIME_H_FILES) \
+ $(ESADMIN_H_FILES) \
+ $(CHARNEG_H_FILES) \
+ $(MTERM2_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) $<
+ $(CPP) $(COPT) $<
+
+{$(CCLDIR)}.c{$(OBJDIR)}.obj:
+ $(CPP) $(COPT) $<
+
+{$(ZOOMDIR)}.c{$(OBJDIR)}.obj:
+ $(CPP) $(COPT) $<
############### 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)
+
+$(CHARNEG_FILES): $(Z3950DIR)\charneg-3.asn
+ @cd $(Z3950DIR)
+ $(TCL) $(TCLOPT) -d z.tcl charneg-3.asn
+ @cd $(WINDIR)
+
+$(MTERM2_FILES): $(Z3950DIR)\mterm2.asn
+ @cd $(Z3950DIR)
+ $(TCL) $(TCLOPT) -d z.tcl mterm2.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)
+$(UTILDIR)\marc8.c: $(UTILDIR)\charconv.sgm
+ @cd $(UTILDIR)
+ $(TCL) charconv.tcl -p marc8 -s 50 charconv.sgm marc8.c
+
+!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)
- @echo Linking the client $(CLIENT)
+ @echo Linking $(CLIENT)
$(LINK) @<<
$(LNKOPT)
$(CLIENT_LINK_OPTIONS)
$(LINK_LIBS)
$(IMPLIB)
$(YAZ_CLIENT_OBJS)
+ /pdb:"$(LIBDIR)\yaz-client.pdb"
+ /map:"$(LIBDIR)\yaz-client.map"
+ /out:$(CLIENT)
+<<
- /pdb:"$(LIBDIR)/yaz-client.pdb"
+$(ZOOMSH) : "$(BINDIR)" $(YAZ_ZOOMSH_OBJS)
+ @echo Linking $(ZOOMSH)
+ $(LINK) @<<
+ $(LNKOPT)
+ $(ZOOMSH_LINK_OPTIONS)
+ $(LINK_LIBS)
+ $(IMPLIB)
+ $(YAZ_ZOOMSH_OBJS)
+ /pdb:"$(LIBDIR)\zoomsh.pdb"
+ /map:"$(LIBDIR)\zoomsh.map"
+ /out:$(ZOOMSH)
+<<
- /map:"$(LIBDIR)/yaz-client.map"
- /out:$(CLIENT)
+$(ZOOMTST1) : "$(BINDIR)" $(YAZ_ZOOMTST1_OBJS)
+ @echo Linking $(ZOOMTST1)
+ $(LINK) @<<
+ $(LNKOPT)
+ $(ZOOMSH_LINK_OPTIONS)
+ $(LINK_LIBS)
+ $(IMPLIB)
+ $(YAZ_ZOOMTST1_OBJS)
+ /pdb:"$(LIBDIR)\zoomtst1.pdb"
+ /map:"$(LIBDIR)\zoomtst1.map"
+ /out:$(ZOOMTST1)
<<
-$(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(SERVER) $(DLL)
- @echo Linking the ztest $(ZTEST)
+$(ZOOMTST2) : "$(BINDIR)" $(YAZ_ZOOMTST2_OBJS)
+ @echo Linking $(ZOOMTST2)
$(LINK) @<<
$(LNKOPT)
- $(ZTEST_LINK_OPTIONS)
+ $(ZOOMSH_LINK_OPTIONS)
$(LINK_LIBS)
- shell32.lib
$(IMPLIB)
- $(SERVER)
- $(ZTEST_OBJS)
+ $(YAZ_ZOOMTST2_OBJS)
+ /pdb:"$(LIBDIR)\zoomtst2.pdb"
+ /map:"$(LIBDIR)\zoomtst2.map"
+ /out:$(ZOOMTST2)
+<<
- /implib:"$(LIBDIR)/yaz-ztest.lib"
+$(ZOOMTST3) : "$(BINDIR)" $(YAZ_ZOOMTST3_OBJS)
+ @echo Linking $(ZOOMTST3)
+ $(LINK) @<<
+ $(LNKOPT)
+ $(ZOOMSH_LINK_OPTIONS)
+ $(LINK_LIBS)
+ $(IMPLIB)
+ $(YAZ_ZOOMTST3_OBJS)
+ /pdb:"$(LIBDIR)\zoomtst3.pdb"
+ /map:"$(LIBDIR)\zoomtst3.map"
+ /out:$(ZOOMTST3)
+<<
- /pdb:"$(LIBDIR)/yaz-ztest.pdb"
+$(ZOOMTST4) : "$(BINDIR)" $(YAZ_ZOOMTST4_OBJS)
+ @echo Linking $(ZOOMTST4)
+ $(LINK) @<<
+ $(LNKOPT)
+ $(ZOOMSH_LINK_OPTIONS)
+ $(LINK_LIBS)
+ $(IMPLIB)
+ $(YAZ_ZOOMTST4_OBJS)
+ /pdb:"$(LIBDIR)\zoomtst4.pdb"
+ /map:"$(LIBDIR)\zoomtst4.map"
+ /out:$(ZOOMTST4)
+<<
- /map:"$(LIBDIR)/yaz-ztest.map"
- /out:$(ZTEST)
+$(ZOOMTST5) : "$(BINDIR)" $(YAZ_ZOOMTST5_OBJS)
+ @echo Linking $(ZOOMTST5)
+ $(LINK) @<<
+ $(LNKOPT)
+ $(ZOOMSH_LINK_OPTIONS)
+ $(LINK_LIBS)
+ $(IMPLIB)
+ $(YAZ_ZOOMTST5_OBJS)
+ /pdb:"$(LIBDIR)\zoomtst5.pdb"
+ /map:"$(LIBDIR)\zoomtst5.map"
+ /out:$(ZOOMTST5)
<<
+$(ZOOMTST6) : "$(BINDIR)" $(YAZ_ZOOMTST6_OBJS)
+ @echo Linking $(ZOOMTST6)
+ $(LINK) @<<
+ $(LNKOPT)
+ $(ZOOMSH_LINK_OPTIONS)
+ $(LINK_LIBS)
+ $(IMPLIB)
+ $(YAZ_ZOOMTST6_OBJS)
+ /pdb:"$(LIBDIR)\zoomtst6.pdb"
+ /map:"$(LIBDIR)\zoomtst6.map"
+ /out:$(ZOOMTST6)
+<<
-$(SERVER) : "$(BINDIR)" $(YAZ_SERVER_OBJS)
- @echo Linking the server $(SERVER)
- $(LINK) $(SERVER_LINK_OPTIONS) @<<
- /nologo
+$(ZOOMTST7) : "$(BINDIR)" $(YAZ_ZOOMTST7_OBJS)
+ @echo Linking $(ZOOMTST7)
+ $(LINK) @<<
+ $(LNKOPT)
+ $(ZOOMSH_LINK_OPTIONS)
+ $(LINK_LIBS)
$(IMPLIB)
- $(YAZ_SERVER_OBJS)
- /out:$(SERVER)
+ $(YAZ_ZOOMTST7_OBJS)
+ /pdb:"$(LIBDIR)\zoomtst7.pdb"
+ /map:"$(LIBDIR)\zoomtst7.map"
+ /out:$(ZOOMTST7)
<<
-# note that this links a lib, so it uses completely different options.
+$(ZOOMTST8) : "$(BINDIR)" $(YAZ_ZOOMTST8_OBJS)
+ @echo Linking $(ZOOMTST8)
+ $(LINK) @<<
+ $(LNKOPT)
+ $(ZOOMSH_LINK_OPTIONS)
+ $(LINK_LIBS)
+ $(IMPLIB)
+ $(YAZ_ZOOMTST8_OBJS)
+ /pdb:"$(LIBDIR)\zoomtst8.pdb"
+ /map:"$(LIBDIR)\zoomtst8.map"
+ /out:$(ZOOMTST8)
+<<
+
+$(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(DLL)
+ @echo Linking the ztest $(ZTEST)
+ $(LINK) @<<
+ $(LNKOPT)
+ $(ZTEST_LINK_OPTIONS)
+ $(LINK_LIBS)
+ shell32.lib
+ $(IMPLIB)
+ $(ZTEST_OBJS)
+ /implib:"$(LIBDIR)\yaz-ztest.lib"
+ /pdb:"$(LIBDIR)\yaz-ztest.pdb"
+ /map:"$(LIBDIR)\yaz-ztest.map"
+ /out:$(ZTEST)
+<<
+# note that this links a lib, so it uses completely different options.
###########################################################
############### Special operations
############## clean
clean:
- del $(DLL)
- del $(CLIENT)
- del $(SERVER)
- del $(ZTEST)
- del $(TMPDIR)\*.
+ -del $(BINDIR)\*.exe
+ -del $(BINDIR)\*.dll
+ -del $(TMPDIR)\*.
- del $(LIBDIR)\*.MAP
+ -del $(LIBDIR)\*.MAP
- del $(LIBDIR)\*.LIB
- del $(OBJDIR)\*.OBJ
-
- del $(PROTOH)
+ -del $(LIBDIR)\*.LIB
+ -del $(OBJDIR)\*.OBJ
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)
+ -del $(Z3950_C_DIR)\z*.c
+ -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.
dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR)
$(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
- if not exist "$@/$(NUL)" mkdir "$@"
+ if not exist "$@/$(NUL)" mkdir "$@"
###########################################################
############### Explicit dependencies
###########################################################
-$(ALL_OBJS): makefile $(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
# makes sure we generate before compiling anything, as the
# new proto.h refers to the generated files, and is included
# in various places
###########################################################
#
# $Log: makefile,v $
-# Revision 1.13 2000-02-28 11:13:03 adam
+# Revision 1.54 2003-02-18 09:11:50 adam
+# Prepare for external utilties: iconv, libxml2 on WIN32
+#
+# Revision 1.53 2003/02/17 22:34:39 adam
+# WIN32 updates
+#
+# Revision 1.52 2002/12/16 14:06:34 adam
+# WIN32 updates for marc8.c
+#
+# Revision 1.51 2002/12/05 12:16:39 adam
+# yaz_strerror. WIN32 updates for mterm2.asn
+#
+# Revision 1.50 2002/10/24 12:14:01 heikki
+# Using a default path to find tcl
+#
+# Revision 1.49 2002/10/22 13:49:53 adam
+# data1 gone
+#
+# Revision 1.48 2002/10/22 10:32:46 adam
+# New source grs1disp.c
+#
+# Revision 1.47 2002/09/06 20:04:49 adam
+# debug=0
+#
+# Revision 1.46 2002/08/30 11:28:01 adam
+# Remove EXPAT reader
+#
+# Revision 1.45 2002/08/27 22:33:30 adam
+# siconv added
+#
+# Revision 1.44 2002/07/25 14:19:18 adam
+# EXPAT support on WIN32
+#
+# Revision 1.43 2002/07/25 13:45:30 adam
+# iconv.dll
+#
+# Revision 1.42 2002/06/05 21:11:00 adam
+# NSIS bz2
+#
+# Revision 1.41 2002/06/04 08:29:53 adam
+# ignore errors on del.
+#
+# Revision 1.40 2002/06/02 21:34:45 adam
+# Remove --enable-module option
+#
+# Revision 1.39 2002/05/31 08:48:06 adam
+# Changed SectionIns for NSIS v1.98
+#
+# Revision 1.38 2002/05/18 09:52:37 oleg
+# Added support of CharacterSetandLanguageNegotiation-3
+# modele (based on Z_PrivateCharacterSet_externallySpecified) at the client
+# side.
+#
+# Revision 1.37 2002/05/17 12:48:30 adam
+# Use __stdcall convention for ZOOM on WIN32
+#
+# Revision 1.36 2002/03/18 21:33:48 adam
+# MARC records embedded in C code for test server
+#
+# Revision 1.35 2002/03/16 10:26:57 adam
+# Added NSIS rules (nmake nsis).
+#
+# Revision 1.34 2002/02/12 15:59:12 adam
+# added z-charneg.obj
+#
+# Revision 1.33 2002/02/11 23:25:26 adam
+# Rustam's patch
+#
+# Revision 1.32 2002/01/30 22:02:03 adam
+# WIN32 updates for YAZ client.
+#
+# Revision 1.31 2001/12/30 22:21:11 adam
+# Scan for ZOOM.
+#
+# Revision 1.30 2001/10/28 23:28:26 adam
+# Enable CCL-to-RPN for YAZ client on WIN32.
+#
+# Revision 1.29 2001/10/25 12:46:07 adam
+# codecs not built as they should.
+#
+# Revision 1.28 2001/10/25 10:45:08 adam
+# Fixed make clean.
+#
+# Revision 1.27 2001/10/24 12:24:43 adam
+# WIN32 updates: ZOOM runs, nmem_init/nmem_exit called in DllMain.
+#
+# 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
+# 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
projects / yaz-moved-to-github.git / blobdiff