summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2007-10-17 14:38:34 (GMT)
committerdgp <dgp@users.sourceforge.net>2007-10-17 14:38:34 (GMT)
commit9e421a80153ea4778e23bfc5ebc25a25861fb08e (patch)
tree9e928b53ae7c271411a37bc8def139a60dd338cc /win
parent469bf66686a3b807980f329a316d7494e80ef1b9 (diff)
downloadtcl-9e421a80153ea4778e23bfc5ebc25a25861fb08e.zip
tcl-9e421a80153ea4778e23bfc5ebc25a25861fb08e.tar.gz
tcl-9e421a80153ea4778e23bfc5ebc25a25861fb08e.tar.bz2
merge updates from HEAD
Diffstat (limited to 'win')
-rw-r--r--win/makefile.vc32
1 files changed, 6 insertions, 26 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index a0e6894..20b2ceb 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
# Copyright (c) 2001-2004 David Gravereaux.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.160.2.6 2007/10/16 03:50:34 dgp Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.160.2.7 2007/10/17 14:38:40 dgp Exp $
#------------------------------------------------------------------------------
# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -834,9 +834,10 @@ $(TMP_DIR)\tclStubLib.obj: $(GENERICDIR)\tclStubLib.c
#---------------------------------------------------------------------
# Generate the source dependencies. Having dependency rules will
-# improve incrimental build accuracy without having to resort to a
-# full rebuild just because some non-global header file like tclCompile.h
-# was changed. These rules aren't needed when building from scratch.
+# improve incremental build accuracy without having to resort to a
+# full rebuild just because some non-global header file like
+# tclCompile.h was changed. These rules aren't needed when building
+# from scratch.
#---------------------------------------------------------------------
depend:
@@ -850,34 +851,13 @@ $(TCLOBJS)
<<
!endif
-#" emacs fix
-
#---------------------------------------------------------------------
# Dependency rules
#---------------------------------------------------------------------
-$(GENERICDIR)\regcomp.c: \
- $(GENERICDIR)\regguts.h \
- $(GENERICDIR)\regc_lex.c \
- $(GENERICDIR)\regc_color.c \
- $(GENERICDIR)\regc_nfa.c \
- $(GENERICDIR)\regc_cvec.c \
- $(GENERICDIR)\regc_locale.c
-$(GENERICDIR)\regcustom.h: \
- $(GENERICDIR)\tclInt.h \
- $(GENERICDIR)\tclPort.h \
- $(GENERICDIR)\regex.h
-$(GENERICDIR)\regexec.c: \
- $(GENERICDIR)\rege_dfa.c \
- $(GENERICDIR)\regguts.h
-$(GENERICDIR)\regerror.c: $(GENERICDIR)\regguts.h
-$(GENERICDIR)\regfree.c: $(GENERICDIR)\regguts.h
-$(GENERICDIR)\regfronts.c: $(GENERICDIR)\regguts.h
-$(GENERICDIR)\regguts.h: $(GENERICDIR)\regcustom.h
-
!if exist("$(OUT_DIR)\depend.mk")
!include "$(OUT_DIR)\depend.mk"
-!message *** Dependency rules in effect.
+!message *** Dependency rules in use.
!else
!message *** Dependency rules are not being used.
!endif