# makefile.mak - makefile for MS NMAKE
-# $Id: makefile,v 1.36 2002-03-18 21:33:48 adam Exp $
+# $Id: makefile,v 1.42 2002-06-05 21:11:00 adam Exp $
#
# Programmed by
# HL: Heikki Levanto, Index Data
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="c:\program files\nsis\makensis-bz2.exe"
nsis: all
$(NSIS) yaz.nsi
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
###########################################################
COMMON_C_OPTIONS= \
/nologo /W3 /GX /FD /c \
- /D "YAZ_MODULE_ill=1" \
- /D "YAZ_MODULE_ccl=1" \
/D "_WINDOWS" \
/D "WIN32" \
/FR"$(OBJDIR)\\" \
$(OBJDIR)\yaz-ccl.obj \
$(OBJDIR)\otherinfo.obj \
$(OBJDIR)\sortspec.obj \
- $(OBJDIR)\z3950oid.obj
+ $(OBJDIR)\z3950oid.obj \
+ $(OBJDIR)\charneg.obj
YAZ_RET_OBJS= \
$(YAZ_ZOOM_OBJS)
YAZ_OBJS= \
- $(COMMON_YAZ_OBJS) \
$(Z3950_OBJS) \
- $(ILL_OBJS)
+ $(ILL_OBJS) \
+ $(COMMON_YAZ_OBJS)
DLL_OBJS= $(YAZ_OBJS)
!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
############## 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.36 2002-03-18 21:33:48 adam
+# 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