X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=40a4ffea14d6cb8f46b7f72359bac807382c9436;hb=4a30229e344fc242c25951daef62af68481067c2;hp=2bd8fd5cf40edf1b54980882000c4e83ace4656a;hpb=1cd88a77abb7c32e5ff938e2f4b9392d03d45ec5;p=yaz-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 2bd8fd5..40a4ffe 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.38 2002-05-18 09:52:37 oleg Exp $
+# $Id: makefile,v 1.49 2002-10-22 13:49:53 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -25,11 +25,19 @@
 
 DEBUG=0   # 0 for release, 1 for debug
 
+# iconv
+HAVE_ICONV=0
+ICONV_DIR = c:\libiconv-1.7.0.1
+
+# TCL
+TCL="C:\Tcl\bin\tclsh83.exe"
+HAVE_TCL=1
+
 default: all
 
 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
@@ -105,6 +113,17 @@ zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
 ############### 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
@@ -112,8 +131,7 @@ zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
 
 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)\\"         \
@@ -153,7 +171,8 @@ 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 \
@@ -170,10 +189,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
@@ -294,7 +309,9 @@ YAZ_UTIL_OBJS= \
    $(OBJDIR)\tpath.obj \
    $(OBJDIR)\wrbuf.obj \
    $(OBJDIR)\xmalloc.obj \
-   $(OBJDIR)\matchstr.obj 
+   $(OBJDIR)\matchstr.obj \
+   $(OBJDIR)\siconv.obj
+
 
 YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\diagbib1.obj \
@@ -305,28 +322,8 @@ YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\otherinfo.obj \
    $(OBJDIR)\sortspec.obj \
    $(OBJDIR)\z3950oid.obj \
-   $(OBJDIR)\charneg.obj
-
-
-YAZ_RET_OBJS= \
-   $(OBJDIR)\d1_absyn.obj\
-   $(OBJDIR)\d1_attset.obj\
-   $(OBJDIR)\d1_doespec.obj\
-   $(OBJDIR)\d1_espec.obj\
-   $(OBJDIR)\d1_expout.obj\
-   $(OBJDIR)\d1_grs.obj\
-   $(OBJDIR)\d1_handle.obj\
-   $(OBJDIR)\d1_map.obj\
-   $(OBJDIR)\d1_marc.obj\
-   $(OBJDIR)\d1_prtree.obj\
-   $(OBJDIR)\d1_read.obj\
-   $(OBJDIR)\d1_soif.obj\
-   $(OBJDIR)\d1_sumout.obj\
-   $(OBJDIR)\d1_sutrs.obj\
-   $(OBJDIR)\d1_tagset.obj\
-   $(OBJDIR)\d1_varset.obj\
-   $(OBJDIR)\d1_write.obj\
-   $(OBJDIR)\d1_if.obj
+   $(OBJDIR)\charneg.obj \
+   $(OBJDIR)\grs1disp.obj
 
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
@@ -373,14 +370,13 @@ COMMON_YAZ_OBJS= \
    $(YAZ_COMSTACK_OBJS) \
    $(YAZ_ZUTIL_OBJS) \
    $(YAZ_CCL_OBJS) \
-   $(YAZ_RET_OBJS) \
    $(YAZ_SERVER_OBJS) \
    $(YAZ_ZOOM_OBJS)
 
 YAZ_OBJS= \
-	$(COMMON_YAZ_OBJS) \
 	$(Z3950_OBJS) \
-	$(ILL_OBJS) 
+	$(ILL_OBJS) \
+	$(COMMON_YAZ_OBJS)
 
 DLL_OBJS= $(YAZ_OBJS)
 
@@ -787,23 +783,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.
@@ -835,7 +830,40 @@ $(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.38  2002-05-18 09:52:37  oleg
+# Revision 1.49  2002-10-22 13:49:53  adam
+# data1 gone
+#
+# Revision 1.48  2002/10/22 10:32:46  adam
+# New source grs1disp.c
+#
+# Revision 1.47  2002/09/06 20:04:49  adam
+# debug=0
+#
+# 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.