# makefile.mak - makefile for MS NMAKE
-# $Id: makefile,v 1.29 2001-10-25 12:46:07 adam Exp $
+# $Id: makefile,v 1.39 2002-05-31 08:48:06 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
default: all
-all: dirs yaz_date_h generate dll client ztest zoomsh
+all: dirs generate dll client ztest zoomsh
+
+NSIS="c:\program files\nsis\makensis.exe"
+
+nsis: all
+ $(NSIS) yaz.nsi
+
+nsishelp:
+ $(NSIS)
generate: generated_files
CLIENT=$(BINDIR)\yaz-client.exe
ZOOMSH=$(BINDIR)\zoomsh.exe
ZTEST=$(BINDIR)\yaz-ztest.exe
-YAZ_DATE_H=$(INCLDIR)\yaz\yaz-date.h
ZOOMTST1=$(BINDIR)\zoomtst1.exe
ZOOMTST2=$(BINDIR)\zoomtst2.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)
ztest: $(ZTEST)
+
zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
- $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7)
-yaz_date_h: $(YAZ_DATE_H)
+ $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8)
###########################################################
############### Compiler and linker options
COMMON_C_OPTIONS= \
/nologo /W3 /GX /FD /c \
/D "YAZ_MODULE_ill=1" \
- /D "WIN32" /D "_WINDOWS" \
- /D "CCL2RPN=1" \
+ /D "YAZ_MODULE_ccl=1" \
+ /D "_WINDOWS" \
+ /D "WIN32" \
/FR"$(OBJDIR)\\" \
/Fo"$(OBJDIR)\\" \
/Fd"$(OBJDIR)\\"
YAZ_CLIENT_OBJS= \
$(OBJDIR)\client.obj \
+ $(OBJDIR)\tabcomplete.obj \
$(OBJDIR)\admin.obj
YAZ_ZOOMSH_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"
$(OBJDIR)\yaz-ccl.obj \
$(OBJDIR)\otherinfo.obj \
$(OBJDIR)\sortspec.obj \
- $(OBJDIR)\z3950oid.obj
+ $(OBJDIR)\z3950oid.obj \
+ $(OBJDIR)\charneg.obj
YAZ_RET_OBJS= \
$(OBJDIR)\zes-psched.obj \
$(OBJDIR)\zes-pset.obj \
$(OBJDIR)\zes-update0.obj \
- $(OBJDIR)\prt-ext.obj
+ $(OBJDIR)\prt-ext.obj \
+ $(OBJDIR)\z-charneg.obj
ILL_OBJS= \
$(OBJDIR)\ill-get.obj\
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 created from z3950v3.asn
Z3950V3_H_FILES= \
$(INCLDIR)\yaz\z-accdes1.h \
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)
GENERATED_C_FILES= \
$(Z3950V3_C_FILES) \
$(ESUPDATE_C_FILES) \
$(UNIVRES_C_FILES) \
$(DATETIME_C_FILES) \
- $(ESADMIN_C_FILES)
+ $(ESADMIN_C_FILES) \
+ $(CHARNEG_C_FILES)
GENERATED_H_FILES= \
$(Z3950V3_H_FILES) \
$(ESUPDATE_H_FILES) \
$(UNIVRES_H_FILES) \
$(DATETIME_H_FILES) \
- $(ESADMIN_H_FILES)
+ $(ESADMIN_H_FILES) \
+ $(CHARNEG_H_FILES)
generated_files: \
$(GENERATED_H_FILES) \
!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
$(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)
+
$(ILL_CORE_FILES): $(ILLDIR)\ill9702.asn
@cd $(ILLDIR)
$(TCL) $(TCLOPT) -d ill.tcl ill9702.asn
/out:$(ZOOMTST7)
<<
+$(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) @<<
dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR)
$(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
- if not exist "$@/$(NUL)" mkdir "$@"
+ if not exist "$@/$(NUL)" mkdir "$@"
###########################################################
###########################################################
#
# $Log: makefile,v $
-# Revision 1.29 2001-10-25 12:46:07 adam
+# 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