# makefile.mak - makefile for MS NMAKE
-# $Id: makefile,v 1.44 2002-07-25 14:19:18 adam Exp $
+# $Id: makefile,v 1.47 2002-09-06 20:04:49 adam Exp $
#
# Programmed by
# HL: Heikki Levanto, Index Data
############### 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
-TCL="C:\Tcl\bin\tclsh83.exe"
+TCL="C:\program files\Tcl\bin\tclsh83.exe"
HAVE_TCL=1
default: all
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!)
COMMON_C_OPTIONS= \
/nologo /W3 /GX /FD /c \
$(ICONV_DEF) \
- $(EXPAT_DEF) \
/D "_WINDOWS" \
/D "WIN32" \
/FR"$(OBJDIR)\\" \
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 \
$(OBJDIR)\tpath.obj \
$(OBJDIR)\wrbuf.obj \
$(OBJDIR)\xmalloc.obj \
- $(OBJDIR)\matchstr.obj
+ $(OBJDIR)\matchstr.obj \
+ $(OBJDIR)\siconv.obj
+
YAZ_ZUTIL_OBJS= \
$(OBJDIR)\diagbib1.obj \
$(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\
###########################################################
#
# $Log: makefile,v $
-# Revision 1.44 2002-07-25 14:19:18 adam
+# 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