diff options
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 9 | ||||
| -rw-r--r-- | win/makefile.bc | 8 | ||||
| -rw-r--r-- | win/makefile.vc | 12 |
3 files changed, 18 insertions, 11 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 5216ca6..9acbbba 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.72 2007/05/05 07:42:58 dkf Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.73 2007/05/14 20:58:28 dgp Exp $ TCLVERSION = @TCL_VERSION@ TCLPATCHL = @TCL_PATCH_LEVEL@ @@ -236,6 +236,7 @@ TKTEST_OBJS = \ testMain.$(OBJEXT) \ tkSquare.$(OBJEXT) \ tkTest.$(OBJEXT) \ + tkOldTest.$(OBJEXT) \ tkWinTest.$(OBJEXT) XLIB_OBJS = \ @@ -387,8 +388,7 @@ TTK_OBJS = \ ttkStubLib.$(OBJEXT) STUB_OBJS = \ - tkStubLib.$(OBJEXT) \ - tkStubImg.$(OBJEXT) + tkStubLib.$(OBJEXT) TCL_DOCS = "$(TCL_SRC_DIR_NATIVE)"/doc/*.[13n] TK_DOCS = "$(ROOT_DIR_NATIVE)"/doc/*.[13n] @@ -645,6 +645,9 @@ testMain.$(OBJEXT): winMain.c tkTest.$(OBJEXT): tkTest.c $(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME) +tkOldTest.$(OBJEXT): tkOldTest.c + $(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME) + tkWinTest.$(OBJEXT): tkWinTest.c $(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME) diff --git a/win/makefile.bc b/win/makefile.bc index 6e4255c..2454156 100644 --- a/win/makefile.bc +++ b/win/makefile.bc @@ -13,7 +13,7 @@ # Copyright (c) 1995-1997 Sun Microsystems, Inc. # Copyright (c) 1998-2000 Ajuba Solutions. # -# RCS: @(#) $Id: makefile.bc,v 1.13 2007/02/28 05:26:37 chengyemao Exp $ +# RCS: @(#) $Id: makefile.bc,v 1.14 2007/05/14 20:58:31 dgp Exp $ # Does not depend on the presence of any environment variables in # order to compile tcl; all needed information is derived from @@ -118,6 +118,7 @@ TKTESTOBJS = \ $(TMPDIR)\tkTest.obj \ $(TMPDIR)\tkSquare.obj \ $(TMPDIR)\testMain.obj \ + $(TMPDIR)\tkOldTest.obj \ $(TMPDIR)\tkWinTest.obj \ $(TCLLIBDIR)\tclThreadTest.obj @@ -231,7 +232,7 @@ TKOBJS = \ # Maintenance hint: Please have multiple members of TKSTUBOBJS be separated # by exactly one ' ' (see below the rule for making TKSTUBLIB) -TKSTUBOBJS = $(TMPDIR)\tkStubLib.obj $(TMPDIR)\tkStubImg.obj +TKSTUBOBJS = $(TMPDIR)\tkStubLib.obj WINDIR = $(ROOT)\win GENERICDIR = $(ROOT)\generic @@ -449,6 +450,9 @@ $(TMPDIR)\testMain.obj: $(WINDIR)\winMain.c $(TMPDIR)\tkTest.obj: $(GENERICDIR)\tkTest.c $(cc32) $(WISH_CFLAGS) -o$@ $? +$(TMPDIR)\tkOldTest.obj: $(GENERICDIR)\tkOldTest.c + $(cc32) $(WISH_CFLAGS) -o$@ $? + $(TMPDIR)\tkWinTest.obj: $(WINDIR)\tkWinTest.c $(cc32) $(WISH_CFLAGS) -o$@ $? diff --git a/win/makefile.vc b/win/makefile.vc index e640c7f..1b04264 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.101 2007/02/28 05:26:37 chengyemao Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.102 2007/05/14 20:58:31 dgp Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -235,6 +235,7 @@ TKTESTOBJS = \ $(TMP_DIR)\testMain.obj \ $(TMP_DIR)\tkSquare.obj \ $(TMP_DIR)\tkTest.obj \ + $(TMP_DIR)\tkOldTest.obj \ $(TMP_DIR)\tkWinTest.obj XLIBOBJS = \ @@ -389,8 +390,7 @@ TTK_OBJS = \ $(TMP_DIR)\ttkStubLib.obj TKSTUBOBJS = \ - $(TMP_DIR)\tkStubLib.obj \ - $(TMP_DIR)\tkStubImg.obj + $(TMP_DIR)\tkStubLib.obj WINDIR = $(ROOT)\win @@ -762,6 +762,9 @@ $(TMP_DIR)\testMain.obj: $(WINDIR)\winMain.c $(TMP_DIR)\tkTest.obj: $(GENERICDIR)\tkTest.c $(cc32) $(WISH_CFLAGS) -Fo$@ $? +$(TMP_DIR)\tkOldTest.obj: $(GENERICDIR)\tkOldTest.c + $(cc32) $(WISH_CFLAGS) -Fo$@ $? + $(TMP_DIR)\tkWinTest.obj: $(WINDIR)\tkWinTest.c $(cc32) $(WISH_CFLAGS) -Fo$@ $? @@ -780,9 +783,6 @@ $(TMP_DIR)\winMain.obj: $(WINDIR)\winMain.c $(TMP_DIR)\tkStubLib.obj : $(GENERICDIR)\tkStubLib.c $(cc32) $(STUB_CFLAGS) $(TK_INCLUDES) -Zl -DSTATIC_BUILD -Fo$@ $? -$(TMP_DIR)\tkStubImg.obj : $(GENERICDIR)\tkStubImg.c - $(cc32) $(STUB_CFLAGS) $(TK_INCLUDES) -Zl -DSTATIC_BUILD -Fo$@ $? - #--------------------------------------------------------------------- # Dedependency rules |