diff options
| author | das <das> | 2005-12-09 00:48:51 (GMT) |
|---|---|---|
| committer | das <das> | 2005-12-09 00:48:51 (GMT) |
| commit | eeef28e57a775d4290fcc11d968af58b50830a0d (patch) | |
| tree | d4cc4ad147a14ead3f76869e5fa86da611d8d993 /unix | |
| parent | 1984dc757cacc9d2a5497ac210daecd3e569f4d6 (diff) | |
| download | tk-eeef28e57a775d4290fcc11d968af58b50830a0d.zip tk-eeef28e57a775d4290fcc11d968af58b50830a0d.tar.gz tk-eeef28e57a775d4290fcc11d968af58b50830a0d.tar.bz2 | |
* generic/tkInt.decls: move all platform test sources from tk lib into
* generic/tkTest.c: tktest directly, removes requirement to export
* macosx/tkMacOSXTest.c: TkplatformtestInit from internal stubs table.
* unix/Makefile.in:
* win/Makefile.in:
* win/makefile.vc:
* win/tkWinTest.c:
* generic/tkIntPlatDecls.h:
* generic/tkStubInit.c: regen.
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 5d6c2f1..e97ba2a 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.110 2005/12/08 21:13:17 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.111 2005/12/09 00:48:54 das Exp $ # Current Tk version; used in various names. @@ -332,7 +332,7 @@ ${KEYSYM_FLAGS} @EXTRA_CC_SWITCHES@ WISH_OBJS = tkAppInit.o -TKTEST_OBJS = tkTestInit.o tkTest.o tkSquare.o +TKTEST_OBJS = tkTestInit.o tkTest.o tkSquare.o $(@TK_WINDOWINGSYSTEM@_TKTEST_OBJS) WIDG_OBJS = tkButton.o tkEntry.o tkFrame.o tkListbox.o \ tkMenu.o tkMenubutton.o tkMenuDraw.o tkMessage.o \ @@ -374,11 +374,13 @@ AQUA_OBJS = tkMacOSXBitmap.o tkMacOSXButton.o tkMacOSXClipboard.o \ tkMacOSXKeyboard.o tkMacOSXKeyEvent.o tkMacOSXMenu.o \ tkMacOSXMenubutton.o tkMacOSXMenus.o tkMacOSXMouseEvent.o \ tkMacOSXNotify.o tkMacOSXRegion.o tkMacOSXScrlbr.o tkMacOSXSend.o \ - tkMacOSXSubwindows.o tkMacOSXTest.o tkMacOSXWindowEvent.o \ + tkMacOSXSubwindows.o tkMacOSXWindowEvent.o \ tkMacOSXWm.o tkMacOSXXStubs.o tkMacOSXCarbonEvents.o \ tkFileFilter.o tkMacWinMenu.o tkPointer.o tkUnix3d.o tkUnixScale.o \ xcolors.o xdraw.o xgc.o ximage.o xutil.o +AQUA_TKTEST_OBJS = tkMacOSXTest.o + OBJS = $(GENERIC_OBJS) $(WIDG_OBJS) $(CANV_OBJS) $(IMAGE_OBJS) $(TEXT_OBJS) \ $(STUB_OBJS) $(@TK_WINDOWINGSYSTEM@_OBJS) @PLAT_OBJS@ @@ -1213,7 +1215,7 @@ tkMacOSXSubwindows.o: $(MAC_OSX_DIR)/tkMacOSXSubwindows.c $(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXSubwindows.c tkMacOSXTest.o: $(MAC_OSX_DIR)/tkMacOSXTest.c - $(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXTest.c + $(CC) -c $(CC_SWITCHES_NO_STUBS) $(MAC_OSX_DIR)/tkMacOSXTest.c tkMacOSXWindowEvent.o: $(MAC_OSX_DIR)/tkMacOSXWindowEvent.c $(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXWindowEvent.c |