X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=838fa49b18191a26bbd2c8535faef58e31e0d64f;hb=6866fce7b026f5ce8b75945f72a844d7b44abd85;hp=f165503afcc2cdb647e549bf1f4857a768333108;hpb=b4bd53509869a8fa32749b4cc9a00aae34a12ada;p=yaz-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index f165503..838fa49 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.44 2002-07-25 14:19:18 adam Exp $
+# $Id: makefile,v 1.48 2002-10-22 10:32:46 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -23,14 +23,10 @@
 ############### Parameters 
 ###########################################################
 
-DEBUG=1   # 0 for release, 1 for debug
-
-# expat
-HAVE_EXPAT=1
-EXPAT_DIR= c:\Expat-1.95.4
+DEBUG=0   # 0 for release, 1 for debug
 
 # iconv
-HAVE_ICONV=1
+HAVE_ICONV=0
 ICONV_DIR = c:\libiconv-1.7.0.1
 
 # TCL
@@ -129,19 +125,6 @@ ICONV_DEF= \
 ICONV_LIB=
 !endif
 
-!if $(HAVE_EXPAT)
-EXPAT_DEF= \
-  /D HAVE_EXPAT_H=1 \
-  /I"$(EXPAT_DIR)\source\lib"
-EXPAT_LIB= \
-  "$(EXPAT_DIR)\libs\libexpat.lib"
-!else
-EXPAT_DEF= \
-  /D HAVE_EXPAT_H=0
-EXPAT_LIB=
-!endif
-  
-  
 ### C and CPP compiler  (the same thing)
 # Note: $(CPP) has already been defined in the environment
 # (if you set things up right!)
@@ -149,7 +132,6 @@ EXPAT_LIB=
 COMMON_C_OPTIONS=          \
   /nologo /W3 /GX /FD /c   \
   $(ICONV_DEF)             \
-  $(EXPAT_DEF)             \
   /D "_WINDOWS"            \
   /D "WIN32"               \
   /FR"$(OBJDIR)\\"         \
@@ -190,7 +172,7 @@ LINK=link.exe
 LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   \
            advapi32.lib uuid.lib \
            wsock32.lib  advapi32.lib \
-           $(ICONV_LIB) $(EXPAT_LIB)
+           $(ICONV_LIB)
 
 COMMON_LNK_OPTIONS= /nologo \
                     /subsystem:windows \
@@ -327,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 \
@@ -338,8 +322,8 @@ YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\otherinfo.obj \
    $(OBJDIR)\sortspec.obj \
    $(OBJDIR)\z3950oid.obj \
-   $(OBJDIR)\charneg.obj
-
+   $(OBJDIR)\charneg.obj \
+   $(OBJDIR)\grs1disp.obj
 
 YAZ_RET_OBJS= \
    $(OBJDIR)\d1_absyn.obj\
@@ -359,9 +343,7 @@ YAZ_RET_OBJS= \
    $(OBJDIR)\d1_tagset.obj\
    $(OBJDIR)\d1_varset.obj\
    $(OBJDIR)\d1_write.obj\
-   $(OBJDIR)\d1_if.obj\
-   $(OBJDIR)\d1_expat.obj
-
+   $(OBJDIR)\d1_if.obj
 
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
@@ -869,7 +851,19 @@ $(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.44  2002-07-25 14:19:18  adam
+# 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