summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authornijtmans <nijtmans>2009-12-02 20:45:16 (GMT)
committernijtmans <nijtmans>2009-12-02 20:45:16 (GMT)
commit4cdefd0f0e6e24b0189eba7244134d7981900914 (patch)
tree636e9f5607893598ac71ee67485da0f671b75a88 /win
parent79404cf9daff8f54e932c97c00e1229d1720a77c (diff)
downloadtcl-4cdefd0f0e6e24b0189eba7244134d7981900914.zip
tcl-4cdefd0f0e6e24b0189eba7244134d7981900914.tar.gz
tcl-4cdefd0f0e6e24b0189eba7244134d7981900914.tar.bz2
tools/genStubs.tcl Add support for win32 CALLBACK functions
and remove obsolete "emitStubs" and "genStubs" functions. win/Makefile.in Use tcltest86.dll for all tests, and add .PHONY rules to preemptively stop trouble that plagued Tk from hitting Tcl too.
Diffstat (limited to 'win')
-rw-r--r--win/Makefile.in30
1 files changed, 17 insertions, 13 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index 66d0110..9df2d0d 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
# "./configure", which is a configuration script generated by the "autoconf"
# program (constructs like "@foo@" will get replaced in the actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.168 2009/11/30 23:10:38 nijtmans Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.169 2009/12/02 20:45:17 nijtmans Exp $
VERSION = @TCL_VERSION@
@@ -414,7 +414,7 @@ $(TCLSH): $(TCLSH_OBJS) @LIBRARIES@ $(TCL_STUB_LIB_FILE) tclsh.$(RES)
$(CC) $(CFLAGS) $(TCLSH_OBJS) $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(LIBS) \
tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE)
-$(TCLTEST): testMain.$(OBJEXT) ${TEST_LIB_FILE} @LIBRARIES@ $(TCL_STUB_LIB_FILE) $(CAT32) tclsh.$(RES)
+$(TCLTEST): testMain.$(OBJEXT) ${TEST_DLL_FILE} @LIBRARIES@ $(TCL_STUB_LIB_FILE) $(CAT32) tclsh.$(RES)
$(CC) $(CFLAGS) testMain.$(OBJEXT) ${TEST_LIB_FILE} $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(LIBS) \
tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE)
@@ -473,18 +473,9 @@ ${REG_LIB_FILE}: ${REG_OBJS}
@MAKE_LIB@ ${REG_OBJS}
@POST_MAKE_LIB@
-${TEST_DLL_FILE}: ${TCLTEST_OBJS} ${TEST_LIB_FILE} ${TCL_STUB_LIB_FILE}
- @-$(RM) ${TEST_DLL_FILE} ${TEST_LIB_FILE}.sav
- @-$(COPY) ${TEST_LIB_FILE} ${TEST_LIB_FILE}.sav
+${TEST_DLL_FILE}: ${TCLTEST_OBJS} ${TCL_STUB_LIB_FILE}
+ @$(RM) ${TEST_DLL_FILE} ${TEST_LIB_FILE}
@MAKE_DLL@ ${TCLTEST_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS)
- @-$(RM) ${TEST_LIB_FILE}
- @-$(COPY) ${TEST_LIB_FILE}.sav ${TEST_LIB_FILE}
- @-$(RM) ${TEST_LIB_FILE}.sav
-
-${TEST_LIB_FILE}: ${TCLTEST_OBJS}
- @$(RM) ${TEST_LIB_FILE}
- @MAKE_LIB@ ${TCLTEST_OBJS}
- @POST_MAKE_LIB@
# use pre-built zlib1.dll
${ZLIB_DLL_FILE}: $(ZLIB_DIR)/win32/${ZLIB_DLL_FILE}
@@ -882,3 +873,16 @@ html-tcl: $(TCLSH)
html-tk: $(TCLSH)
$(MAKE) shell SCRIPT="$(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) --srcdir=$(ROOT_DIR)/.. $(BUILD_HTML_FLAGS) --tk"
+#
+# The list of all the targets that do not correspond to real files. This stops
+# 'make' from getting confused when someone makes an error in a rule.
+#
+
+.PHONY: all tcltest binaries libraries doc gendate gentommath_h install
+.PHONY: install-binaries install-libraries install-tzdata install-msgs
+.PHONY: install-doc install-private-headers test test-tcl runtest shell
+.PHONY: gdb depend cleanhelp clean distclean packages install-packages
+.PHONY: test-packages clean-packages distclean-packages genstubs html
+.PHONY: html-tcl html-tk
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.