From 8961196a00e44f0bb7118ecdc25d15b9d5fa98b1 Mon Sep 17 00:00:00 2001 From: hobbs Date: Sat, 8 Apr 2000 06:59:09 +0000 Subject: * win/makefile.vc (TKTEST_OBJS): * win/Makefile.in (TKTEST_OBJS): moved tkWinTest.c from normal objs to TKTEST_OBJS where it belonged. --- win/Makefile.in | 12 ++++++++---- win/makefile.vc | 7 +++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/win/Makefile.in b/win/Makefile.in index ab801f1..1af4b34 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.18 2000/02/08 11:31:49 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.19 2000/04/08 06:59:09 hobbs Exp $ TCLVERSION = @TCL_VERSION@ VERSION = @TK_VERSION@ @@ -214,13 +214,15 @@ TKTEST_OBJS = \ $(TCLTEST_OBJS) \ testMain.$(OBJEXT) \ tkSquare.$(OBJEXT) \ - tkTest.$(OBJEXT) + tkTest.$(OBJEXT) \ + tkWinTest.$(OBJEXT) TKTEST_OBJS_NATIVE = \ $(TCLTEST_OBJS_NATIVE) \ testMain.$(OBJEXT) \ tkSquare.$(OBJEXT) \ - tkTest.$(OBJEXT) + tkTest.$(OBJEXT) \ + tkWinTest.$(OBJEXT) XLIB_OBJS = \ xcolors.$(OBJEXT) \ @@ -254,7 +256,6 @@ TK_OBJS = \ tkWinRegion.$(OBJEXT) \ tkWinScrlbr.$(OBJEXT) \ tkWinSend.$(OBJEXT) \ - tkWinTest.$(OBJEXT) \ tkWinWindow.$(OBJEXT) \ tkWinWm.$(OBJEXT) \ tkWinX.$(OBJEXT) \ @@ -514,6 +515,9 @@ testMain.$(OBJEXT): winMain.c tkTest.$(OBJEXT): tkTest.c $(CC) -c $(CC_SWITCHES) $(DEPARG) $(CC_OBJNAME) +tkWinTest.$(OBJEXT): tkWinTest.c + $(CC) -c $(CC_SWITCHES) $(DEPARG) $(CC_OBJNAME) + tkSquare.$(OBJEXT): tkSquare.c $(CC) -c $(CC_SWITCHES) $(DEPARG) $(CC_OBJNAME) diff --git a/win/makefile.vc b/win/makefile.vc index 036892d..6cac887 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -4,7 +4,7 @@ # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # Copyright (c) 1995-1997 Sun Microsystems, Inc. -# RCS: @(#) $Id: makefile.vc,v 1.32 2000/02/10 02:54:23 hobbs Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.33 2000/04/08 06:59:09 hobbs Exp $ # Does not depend on the presence of any environment variables in # order to compile tcl; all needed information is derived from @@ -105,6 +105,7 @@ TKTESTOBJS = \ $(TMPDIR)\tkTest.obj \ $(TMPDIR)\tkSquare.obj \ $(TMPDIR)\testMain.obj \ + $(TMPDIR)\tkWinTest.obj \ $(TCLLIBDIR)\tclThreadTest.obj XLIBOBJS = \ @@ -139,7 +140,6 @@ TKOBJS = \ $(TMPDIR)\tkWinRegion.obj \ $(TMPDIR)\tkWinScrlbr.obj \ $(TMPDIR)\tkWinSend.obj \ - $(TMPDIR)\tkWinTest.obj \ $(TMPDIR)\tkWinWindow.obj \ $(TMPDIR)\tkWinWm.obj \ $(TMPDIR)\tkWinX.obj \ @@ -422,6 +422,9 @@ $(TMPDIR)\testMain.obj: $(ROOT)\win\winMain.c $(TMPDIR)\tkTest.obj: $(ROOT)\generic\tkTest.c $(cc32) $(WISH_CFLAGS) -Fo$@ $? +$(TMPDIR)\tkWinTest.obj: $(ROOT)\generic\tkWinTest.c + $(cc32) $(WISH_CFLAGS) -Fo$@ $? + $(TMPDIR)\tkSquare.obj: $(ROOT)\generic\tkSquare.c $(cc32) $(WISH_CFLAGS) -Fo$@ $? -- cgit v0.12