diff options
| author | das <das> | 2002-09-10 09:59:15 (GMT) |
|---|---|---|
| committer | das <das> | 2002-09-10 09:59:15 (GMT) |
| commit | 6d12894460cf9a45380c716dd6b9c5f4f030053f (patch) | |
| tree | 92c15956be96895ae65a5ae5d75c9049ac9145db /macosx/Makefile | |
| parent | 742855d0d4eca7702b6023aa18ecce61b2bec00a (diff) | |
| download | tk-6d12894460cf9a45380c716dd6b9c5f4f030053f.zip tk-6d12894460cf9a45380c716dd6b9c5f4f030053f.tar.gz tk-6d12894460cf9a45380c716dd6b9c5f4f030053f.tar.bz2 | |
* unix/Makefile.in: added DYLIB_INSTALL_DIR variable for Darwin
and set it to default value ${LIB_RUNTIME_DIR}
* unix/tcl.m4 (Darwin): use DYLIB_INSTALL_DIR instead of
LIB_RUNTIME_DIR in the -install_name argument to ld.
* unix/configure: regen.
* macosx/Wish.pbproj/project.pbxproj:
* macosx/Makefile: added support for building Tcl as an embedded
framework, i.e. using an dyld install_name containing
@executable_path/../Frameworks via the new DYLIB_INSTALL_DIR
unix/Makefile variable.
Diffstat (limited to 'macosx/Makefile')
| -rw-r--r-- | macosx/Makefile | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/macosx/Makefile b/macosx/Makefile index dc4f77f..920f43e 100644 --- a/macosx/Makefile +++ b/macosx/Makefile @@ -3,7 +3,7 @@ # Simple makefile for building on Mac OS X with the # Project Builder command line tool 'pbxbuild' # -# RCS: @(#) $Id: Makefile,v 1.2 2002/08/31 06:12:29 das Exp $ +# RCS: @(#) $Id: Makefile,v 1.3 2002/09/10 09:59:16 das Exp $ # ################################################################################ @@ -25,12 +25,18 @@ DEPBUILD = ${BUILD} -buildstyle "${DEPBUILDSTYLE}" INSTALLOPTS = INSTALL_ROOT="${INSTALL_ROOT}" +EMBEDDEDOPTS = DYLIB_INSTALL_PATH="@executable_path/../Frameworks" + ################################################################################ all: develop deploy install: install-develop install-deploy +embedded: embedded-develop embedded-deploy + +install-embedded: install-embedded-develop install-embedded-deploy cleanup-embedded + clean: clean-develop clean-deploy ################################################################################ @@ -47,6 +53,18 @@ install-develop: install-deploy: ${DEPBUILD} install ${INSTALLOPTS} +embedded-develop: + ${DEVBUILD} ${EMBEDDEDOPTS} + +embedded-deploy: + ${DEPBUILD} ${EMBEDDEDOPTS} + +install-embedded-develop: + ${DEVBUILD} install ${INSTALLOPTS} ${EMBEDDEDOPTS} + +install-embedded-deploy: + ${DEPBUILD} install ${INSTALLOPTS} ${EMBEDDEDOPTS} + clean-develop: ${DEVBUILD} clean @@ -54,3 +72,15 @@ clean-deploy: ${DEPBUILD} clean ################################################################################ + +cleanup-embedded: + @( \ + cd ${INSTALL_ROOT}; \ + rm -f Frameworks; \ + rm -rf @executable_path; \ + rm -rf Library/Frameworks/Tcl.framework; \ + rm -rf Library/Frameworks/Tk.framework; \ + if [ -d Library/Frameworks ]; then rmdir -p Library/Frameworks; fi; \ + ) + +################################################################################ |