diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-09 08:57:18 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-09 08:57:18 (GMT) |
commit | 89c692e438532acea0a9652c1d264a54e315c1b9 (patch) | |
tree | 9604615ed2e2e1dc455e4c9ad2f8567c2b6e7ca5 | |
parent | 7f375dfb32fb373b00130ef8729622758f1d009a (diff) | |
parent | fcfecf0c0d902bcabce45b30db42a5d387ae774a (diff) | |
download | tcl-89c692e438532acea0a9652c1d264a54e315c1b9.zip tcl-89c692e438532acea0a9652c1d264a54e315c1b9.tar.gz tcl-89c692e438532acea0a9652c1d264a54e315c1b9.tar.bz2 |
Merge 8.5
-rw-r--r-- | win/Makefile.in | 6 | ||||
-rwxr-xr-x | win/configure | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index fa68124..988a1af 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -542,6 +542,12 @@ tclWinInit.${OBJEXT}: tclWinInit.c tclWinPipe.${OBJEXT}: tclWinPipe.c $(CC) -c $(CC_SWITCHES) -DBUILD_tcl $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME) +tclWinReg.${OBJEXT}: tclWinReg.c + $(CC) -c $(CC_SWITCHES) $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME) + +tclWinDde.${OBJEXT}: tclWinDde.c + $(CC) -c $(CC_SWITCHES) $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME) + testMain.${OBJEXT}: tclAppInit.c $(CC) -c $(CC_SWITCHES) -DTCL_TEST @DEPARG@ $(CC_OBJNAME) diff --git a/win/configure b/win/configure index 6057073..f86ba67 100755 --- a/win/configure +++ b/win/configure @@ -3019,7 +3019,7 @@ fi echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 set x ${MAKE-make} -ac_make=`AS_ECHO("$[2]") | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +ac_make=`echo "" | sed 'y,:./+-,___p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else |