X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=cbd3e75ddd92fc242ef838a4721561569c05f46c;hb=a5c369a03734cbb9de4181fe294f409a0e655de4;hp=5412949502ad25c6c18264c3a046bca89ccceda3;hpb=5c1c250634b4e4637f6942820e792d8d43031ba2;p=yaz-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 5412949..cbd3e75 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.34 2002-02-12 15:59:12 adam Exp $
+# $Id: makefile,v 1.41 2002-06-04 08:29:53 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -27,7 +27,15 @@ DEBUG=0   # 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
 
@@ -75,7 +83,6 @@ IMPLIB=$(LIBDIR)\Yaz.lib
 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
@@ -94,8 +101,6 @@ ztest: $(ZTEST)
 zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
  $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8)
 
-yaz_date_h: $(YAZ_DATE_H)
-
 ###########################################################
 ############### Compiler and linker options 
 ###########################################################
@@ -107,8 +112,6 @@ yaz_date_h: $(YAZ_DATE_H)
 
 COMMON_C_OPTIONS=          \
   /nologo /W3 /GX /FD /c   \
-  /D "YAZ_MODULE_ill=1"    \
-  /D "YAZ_MODULE_ccl=1"    \
   /D "_WINDOWS"            \
   /D "WIN32"               \
   /FR"$(OBJDIR)\\"         \
@@ -231,6 +234,7 @@ YAZ_SERVER_OBJS= \
 	"$(OBJDIR)\tcpdchk.obj" 
 
 ZTEST_OBJS= \
+	"$(OBJDIR)\read-marc.obj" \
 	"$(OBJDIR)\read-grs.obj" \
 	"$(OBJDIR)\ztest.obj" 
 
@@ -298,7 +302,8 @@ YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\yaz-ccl.obj \
    $(OBJDIR)\otherinfo.obj \
    $(OBJDIR)\sortspec.obj \
-   $(OBJDIR)\z3950oid.obj
+   $(OBJDIR)\z3950oid.obj \
+   $(OBJDIR)\charneg.obj
 
 
 YAZ_RET_OBJS= \
@@ -371,9 +376,9 @@ COMMON_YAZ_OBJS= \
    $(YAZ_ZOOM_OBJS)
 
 YAZ_OBJS= \
-	$(COMMON_YAZ_OBJS) \
 	$(Z3950_OBJS) \
-	$(ILL_OBJS) 
+	$(ILL_OBJS) \
+	$(COMMON_YAZ_OBJS)
 
 DLL_OBJS= $(YAZ_OBJS)
 
@@ -542,11 +547,6 @@ generated_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
@@ -785,14 +785,14 @@ $(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(DLL)
 
 ############## 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
@@ -833,7 +833,30 @@ $(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.34  2002-02-12 15:59:12  adam
+# 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