X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=488c958cda3ea9552063ec2bce79ea451c731ab5;hb=91e4c648cb5ba156f197059870050252d497bc4d;hp=e5c0e2d3d4c674c0117647a44ad7da38898d8444;hpb=f1d9f7b3b3ba4e39f261f9b820dad51b8754549c;p=yaz-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index e5c0e2d..488c958 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.35 2002-03-16 10:26:57 adam Exp $
+# $Id: makefile,v 1.43 2002-07-25 13:45:30 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -23,13 +23,21 @@
 ############### Parameters 
 ###########################################################
 
-DEBUG=0   # 0 for release, 1 for debug
+DEBUG=1   # 0 for release, 1 for debug
+
+# iconv
+HAVE_ICONV=1
+ICONV_DIR = c:\libiconv-1.7.0.1
+
+# TCL
+TCL="C:\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.exe"
+NSIS="c:\program files\nsis\makensis-bz2.exe"
 
 nsis: all
 	$(NSIS) yaz.nsi
@@ -83,7 +91,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
@@ -102,21 +109,29 @@ ztest: $(ZTEST)
 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
 # (if you set things up right!)
 
 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)\\"         \
@@ -156,7 +171,7 @@ LINK=link.exe
 
 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 \
@@ -173,10 +188,6 @@ ZOOMSH_LINK_OPTIONS = /subsystem:console
 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
@@ -239,6 +250,7 @@ YAZ_SERVER_OBJS= \
 	"$(OBJDIR)\tcpdchk.obj" 
 
 ZTEST_OBJS= \
+	"$(OBJDIR)\read-marc.obj" \
 	"$(OBJDIR)\read-grs.obj" \
 	"$(OBJDIR)\ztest.obj" 
 
@@ -306,7 +318,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= \
@@ -379,9 +392,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)
 
@@ -550,11 +563,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
@@ -793,23 +801,22 @@ $(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
-	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.
@@ -841,7 +848,33 @@ $(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.35  2002-03-16 10:26:57  adam
+# 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