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

diff --git a/win/makefile b/win/makefile
index 2e519fe..40a4ffe 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.45 2002-08-27 22:33:30 adam Exp $
+# $Id: makefile,v 1.49 2002-10-22 13:49:53 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -23,18 +23,14 @@
 ############### Parameters 
 ###########################################################
 
-DEBUG=1   # 0 for release, 1 for debug
-
-# expat
-HAVE_EXPAT=0
-EXPAT_DIR= c:\Expat-1.95.4
+DEBUG=0   # 0 for release, 1 for debug
 
 # iconv
 HAVE_ICONV=0
 ICONV_DIR = c:\libiconv-1.7.0.1
 
 # TCL
-TCL="C:\program files\Tcl\bin\tclsh83.exe"
+TCL="C:\Tcl\bin\tclsh83.exe"
 HAVE_TCL=1
 
 default: all
@@ -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 \
@@ -340,30 +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)\d1_expat.obj
-
+   $(OBJDIR)\charneg.obj \
+   $(OBJDIR)\grs1disp.obj
 
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
@@ -410,7 +370,6 @@ COMMON_YAZ_OBJS= \
    $(YAZ_COMSTACK_OBJS) \
    $(YAZ_ZUTIL_OBJS) \
    $(YAZ_CCL_OBJS) \
-   $(YAZ_RET_OBJS) \
    $(YAZ_SERVER_OBJS) \
    $(YAZ_ZOOM_OBJS)
 
@@ -871,7 +830,19 @@ $(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.45  2002-08-27 22:33:30  adam
+# 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