diff options
| author | das <das> | 2004-11-11 01:26:40 (GMT) |
|---|---|---|
| committer | das <das> | 2004-11-11 01:26:40 (GMT) |
| commit | ce94eed8e3c51494a411e1389946fabf9923ff43 (patch) | |
| tree | f24f480319309f3272f2b41ab1563f81c89ae1fc /macosx/Makefile | |
| parent | f4d485d83668861b7724e5349c8b5c3d4f70e28c (diff) | |
| download | tk-ce94eed8e3c51494a411e1389946fabf9923ff43.zip tk-ce94eed8e3c51494a411e1389946fabf9923ff43.tar.gz tk-ce94eed8e3c51494a411e1389946fabf9923ff43.tar.bz2 | |
* generic/tkMain.c:
* macosx/tkMacOSXAppInit.c (removed):
* macosx/Wish.pbproj/project.pbxproj:
* macosx/tkMacOSXInit.c:
* macosx/tkMacOSXInt.h: changes to make TkAqua dynamically loadable,
enabling [package require Tk] from tclsh. Startup code from
tkMacOSXAppInit.c moved into tkMacOSXInit.c, added code that
notifies the window server that an unbundled executable is a full
GUI application after loading Tk. [Patch 1035348]
* doc/wm.n: documented [wm attributes] on Mac OS X. [Bug 606665]
* macosx/tkMacOSXWm.c: implemented TIP 222 [wm attributes -alpha] on
Mac OS X. [Patch 892194]
WmIconbitmapCmd: adopted FSRef changes from [wm atttrs -titlepath].
* macosx/tkMacOSXButton.c:
* macosx/tkMacOSXMenus.c:
* macosx/tkMacOSXRegion.c:
* macosx/tkMacOSXSubwindows.c: synced spacing/formatting with HEAD.
* macosx/tkMacOSXMouseEvent.c: endianness fixes.
* macosx/Wish.pbproj/project.pbxproj: corrected path to html help
inside framework.
* macosx/Makefile: prevent parallel make from building several
targets at the same time.
Ensure that xcodebuild will use Wish.pbproj project even if a .xcode
project is also present.
Diffstat (limited to 'macosx/Makefile')
| -rw-r--r-- | macosx/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/macosx/Makefile b/macosx/Makefile index 331de81..ad5b4c9 100644 --- a/macosx/Makefile +++ b/macosx/Makefile @@ -3,7 +3,7 @@ # Makefile to build AquaTk on Mac OS X packaged as a Framework # uses Project Builder command line tool 'pbxbuild' # -# RCS: @(#) $Id: Makefile,v 1.7.2.6 2004/07/20 06:05:59 das Exp $ +# RCS: @(#) $Id: Makefile,v 1.7.2.7 2004/11/11 01:26:42 das Exp $ # ################################################################################ @@ -44,8 +44,8 @@ PBXBUILD = /usr/bin/pbxbuild XCODEBUILD = /usr/bin/xcodebuild BUILDCMD = `if [ -f $(XCODEBUILD) ]; then \ - echo "$(XCODEBUILD)"; \ - else echo "$(PBXBUILD)"; fi` + echo "$(XCODEBUILD) -project $$(ls -d *.pbproj)"; \ + else echo "$(PBXBUILD)"; fi` MAKE_VARS := SYMROOT OBJROOT BINDIR APPLICATION_INSTALL_PATH \ TCL_FRAMEWORK_DIR TCLSH_DIR @@ -128,4 +128,6 @@ cleanup-embedded: embedded-develop embedded-deploy install-embedded-develop install-embedded-deploy \ clean-develop clean-deploy cleanup-embedded +.NOTPARALLEL: + ################################################################################ |