# makefile.mak - makefile for MS NMAKE
-# $Id: makefile,v 1.31 2001-12-30 22:21:11 adam Exp $
+# $Id: makefile,v 1.46 2002-08-30 11:28:01 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
+
+# iconv
+HAVE_ICONV=0
+ICONV_DIR = c:\libiconv-1.7.0.1
+
+# TCL
+TCL="C:\program files\Tcl\bin\tclsh83.exe"
+HAVE_TCL=1
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-bz2.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
zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
$(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8)
-yaz_date_h: $(YAZ_DATE_H)
-
###########################################################
############### 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
+!else
+ICONV_DEF= \
+ /D HAVE_ICONV_H=0
+ICONV_LIB=
+!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 "YAZ_MODULE_ill=1" \
- /D "YAZ_MODULE_ccl=1" \
+ $(ICONV_DEF) \
/D "_WINDOWS" \
/D "WIN32" \
/FR"$(OBJDIR)\\" \
LINK_LIBS= kernel32.lib user32.lib gdi32.lib \
advapi32.lib uuid.lib \
- wsock32.lib advapi32.lib
+ wsock32.lib advapi32.lib \
+ $(ICONV_LIB)
COMMON_LNK_OPTIONS= /nologo \
/subsystem:windows \
SERVER_LINK_OPTIONS = -lib
ZTEST_LINK_OPTIONS = /subsystem:console
-# TCL
-TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
-HAVE_TCL=1
-
COMMON_TCL_OPTIONS= ..\util\yaz-comp -I$(INCLDIR) -i yaz
# Final opt variables
YAZ_CLIENT_OBJS= \
$(OBJDIR)\client.obj \
+ $(OBJDIR)\tabcomplete.obj \
$(OBJDIR)\admin.obj
YAZ_ZOOMSH_OBJS = \
"$(OBJDIR)\tcpdchk.obj"
ZTEST_OBJS= \
+ "$(OBJDIR)\read-marc.obj" \
"$(OBJDIR)\read-grs.obj" \
"$(OBJDIR)\ztest.obj"
$(OBJDIR)\tpath.obj \
$(OBJDIR)\wrbuf.obj \
$(OBJDIR)\xmalloc.obj \
- $(OBJDIR)\matchstr.obj
+ $(OBJDIR)\matchstr.obj \
+ $(OBJDIR)\siconv.obj
+
YAZ_ZUTIL_OBJS= \
$(OBJDIR)\diagbib1.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\
$(YAZ_ZOOM_OBJS)
YAZ_OBJS= \
- $(COMMON_YAZ_OBJS) \
$(Z3950_OBJS) \
- $(ILL_OBJS)
+ $(ILL_OBJS) \
+ $(COMMON_YAZ_OBJS)
DLL_OBJS= $(YAZ_OBJS)
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
############## clean
clean:
- del $(BINDIR)\*.exe
- del $(BINDIR)\*.dll
- del $(TMPDIR)\*.
+ -del $(BINDIR)\*.exe
+ -del $(BINDIR)\*.dll
+ -del $(TMPDIR)\*.
- del $(LIBDIR)\*.MAP
+ -del $(LIBDIR)\*.MAP
- del $(LIBDIR)\*.LIB
- del $(OBJDIR)\*.OBJ
+ -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.
###########################################################
#
# $Log: makefile,v $
-# Revision 1.31 2001-12-30 22:21:11 adam
+# 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
projects / yaz-moved-to-github.git / blobdiff