diff options
| author | das <das> | 2003-07-18 02:02:28 (GMT) |
|---|---|---|
| committer | das <das> | 2003-07-18 02:02:28 (GMT) |
| commit | 2b7692adde444f5fddd9059308d594aaa73039da (patch) | |
| tree | 8de41b90c5a7dc95515607cfec4bf15284512fc4 /macosx/Makefile | |
| parent | 145840ca6f6edfb0993d3eb9ac0dedeb9398a2e6 (diff) | |
| download | tk-2b7692adde444f5fddd9059308d594aaa73039da.zip tk-2b7692adde444f5fddd9059308d594aaa73039da.tar.gz tk-2b7692adde444f5fddd9059308d594aaa73039da.tar.bz2 | |
* macosx/Makefile: Changes for new tcl buildsystem.
* macosx/Wish.pbproj/jingham.pbxuser:
* macosx/Wish.pbproj/project.pbxproj:
Changes for new tcl buildsystem.
Changed build to include tk specific html help in Tk.framework
instead of Tcl.framework.
Set default SYMROOT in target options to simplify setting up PB
(manually setting common build folder for tcl & tk no longer needed).
* macosx/README: Updated info for changes to buildsystem,
html help location and PB setup.
Diffstat (limited to 'macosx/Makefile')
| -rw-r--r-- | macosx/Makefile | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/macosx/Makefile b/macosx/Makefile index c6e2d4d..b17677c 100644 --- a/macosx/Makefile +++ b/macosx/Makefile @@ -3,17 +3,19 @@ # Simple makefile for building on Mac OS X with the # Project Builder command line tool 'pbxbuild' # -# RCS: @(#) $Id: Makefile,v 1.8 2003/03/18 13:47:52 das Exp $ +# RCS: @(#) $Id: Makefile,v 1.9 2003/07/18 02:02:28 das Exp $ # ################################################################################ INSTALL_ROOT ?= BUILD_DIR ?= ${CURDIR}/../../build +SYMROOT ?= ${BUILD_DIR}/${PROJECT} -TCL_FRAMEWORK_DIR ?= ${BUILD_DIR} +TCL_FRAMEWORK_DIR ?= ${BUILD_DIR}/tcl TCLSH_DIR ?= ${TCL_FRAMEWORK_DIR} +PROJECT = tk TARGET = Wish DEVBUILDSTYLE = Development @@ -21,8 +23,9 @@ DEPBUILDSTYLE = Deployment PBXBUILD = /usr/bin/pbxbuild -BUILD = ${PBXBUILD} SYMROOT="${BUILD_DIR}" -target "${TARGET}" \ - TCL_FRAMEWORK_DIR="${TCL_FRAMEWORK_DIR}" TCLSH_DIR="${TCLSH_DIR}" +BUILD = ${PBXBUILD} SYMROOT="${SYMROOT}" -target "${TARGET}" \ + TCL_FRAMEWORK_DIR="${TCL_FRAMEWORK_DIR}" \ + TCLSH_DIR="${TCLSH_DIR}" DEVBUILD = ${BUILD} -buildstyle "${DEVBUILDSTYLE}" DEPBUILD = ${BUILD} -buildstyle "${DEPBUILDSTYLE}" @@ -77,10 +80,6 @@ clean-deploy: ################################################################################ -forceRelink: - @-cd ${BUILD_DIR}; \ - rm -rf Tk.framework Wish\ Shell.app libtkstub8.4.a - cleanup-embedded: @-cd ${INSTALL_ROOT}; \ chmod -RH u+w Library/Frameworks/Tcl.framework; \ @@ -93,7 +92,6 @@ cleanup-embedded: .PHONY: all install embedded clean develop deploy install-develop install-deploy \ embedded-develop embedded-deploy install-embedded-develop install-embedded-deploy \ -clean-develop clean-deploy forceRelink \ -cleanup-embedded +clean-develop clean-deploy cleanup-embedded ################################################################################ |