diff options
| author | mdejong <mdejong> | 2001-11-25 06:43:43 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2001-11-25 06:43:43 (GMT) |
| commit | 2c38d7f94081181c16b469516ddb54c703d54516 (patch) | |
| tree | ab3bf234fc916dc0e3ec3900f405696290fa9ce2 /win | |
| parent | bd2364c40a60fff4cad9b1c9e78a8f3b539e5c52 (diff) | |
| download | tk-2c38d7f94081181c16b469516ddb54c703d54516.zip tk-2c38d7f94081181c16b469516ddb54c703d54516.tar.gz tk-2c38d7f94081181c16b469516ddb54c703d54516.tar.bz2 | |
* unix/Makefile.in: Add comments to better describe
TCL_EXE and when it should be available. Add
rule that prints message about running `make genstubs`
when tkStubInit.c is out of date.
* win/Makefile.in: Add TCL_TOOL_DIR and TCL_EXE
variables to better match the Tcl Makefile. Add
genstubs rule so tkSTubInit.c can be regenerated.
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index c8b4c4c..946125f 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.45 2001/11/11 03:21:24 mdejong Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.46 2001/11/25 06:43:44 mdejong Exp $ TCLVERSION = @TCL_VERSION@ VERSION = @TK_VERSION@ @@ -84,6 +84,7 @@ TCL_BIN_DIR = @TCL_BIN_DIR@ # for this version of Tk ("srcdir" will be replaced or has already # been replaced by the configure script): TCL_GENERIC_DIR = @TCL_SRC_DIR@/generic +TCL_TOOL_DIR = @TCL_SRC_DIR@/tools # Converts a POSIX path to a Windows native path. CYGPATH = @CYGPATH@ @@ -186,6 +187,13 @@ COPY = cp TCLSH_PROG = @TCLSH_PROG@ +# TCL_EXE is the name of a tclsh executable that is available *BEFORE* +# running make for the first time. Certain build targets (make genstubs) +# need it to be available on the PATH. This executable should *NOT* be +# required just to do a normal build although it can be required to run +# make dist. +TCL_EXE = tclsh + CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ -I"${GENERIC_DIR_NATIVE}" -I"${WIN_DIR_NATIVE}" \ -I"${XLIB_DIR_NATIVE}" -I"${BITMAP_DIR_NATIVE}" \ @@ -592,3 +600,17 @@ distclean: clean Makefile: $(SRC_DIR)/Makefile.in ./config.status + +# +# Regenerate the stubs files. +# + +$(GENERIC_DIR)/tkStubInit.c: $(GENERIC_DIR)/tk.decls \ + $(GENERIC_DIR)/tkInt.decls + @echo "Warning: run \"make genstubs\" to regenerate tkStubInit.c" + +genstubs: + $(TCL_EXE) "$(TCL_TOOL_DIR}\genStubs.tcl" \ + "$(GENERIC_DIR_NATIVE)" \ + "$(GENERIC_DIR_NATIVE)\tk.decls" \ + "$(GENERIC_DIR_NATIVE)\tkInt.decls" |