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

diff --git a/win/makefile b/win/makefile
index 838fa49..2a91292 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.48 2002-10-22 10:32:46 adam Exp $
+# $Id: makefile,v 1.50 2002-10-24 12:14:01 heikki Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -18,6 +18,7 @@
 #   for you. You can find this somewhere near DevStudio\VC\BIN
 # - RegSvr32 must also be along the path, often in WINDOWS\SYSTEM
 # - TCL has to be available too, if compiling for NEW_Z3950
+# - You may have to edit the path to tcl below
 
 ###########################################################
 ############### Parameters 
@@ -30,7 +31,8 @@ HAVE_ICONV=0
 ICONV_DIR = c:\libiconv-1.7.0.1
 
 # TCL
-TCL="C:\Tcl\bin\tclsh83.exe"
+#TCL="C:\Tcl\bin\tclsh83.exe"
+TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
 HAVE_TCL=1
 
 default: all
@@ -325,26 +327,6 @@ YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\charneg.obj \
    $(OBJDIR)\grs1disp.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
-
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
    $(OBJDIR)\z-univ.obj\
@@ -390,7 +372,6 @@ COMMON_YAZ_OBJS= \
    $(YAZ_COMSTACK_OBJS) \
    $(YAZ_ZUTIL_OBJS) \
    $(YAZ_CCL_OBJS) \
-   $(YAZ_RET_OBJS) \
    $(YAZ_SERVER_OBJS) \
    $(YAZ_ZOOM_OBJS)
 
@@ -851,7 +832,13 @@ $(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.48  2002-10-22 10:32:46  adam
+# Revision 1.50  2002-10-24 12:14:01  heikki
+# Using a default path to find tcl
+#
+# 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