diff options
| author | das <das> | 2007-04-29 02:21:31 (GMT) |
|---|---|---|
| committer | das <das> | 2007-04-29 02:21:31 (GMT) |
| commit | 9ef12ec2e6b788e6fd8c838ca5eb1f4c02c4db29 (patch) | |
| tree | f3b588b14f9fc50815a26ad5cff212efc666c721 /macosx/Makefile | |
| parent | 3d880fffc971a2ee2d80081689bbafd1c4b8544e (diff) | |
| download | tcl-9ef12ec2e6b788e6fd8c838ca5eb1f4c02c4db29.zip tcl-9ef12ec2e6b788e6fd8c838ca5eb1f4c02c4db29.tar.gz tcl-9ef12ec2e6b788e6fd8c838ca5eb1f4c02c4db29.tar.bz2 | |
* macosx/tclMacOSXNotify.c: fix warnings.
* macosx/README: sync whitespace/formatting with HEAD.
* macosx/tclMacOSXBundle.c:
* macosx/tclMacOSXNotify.c:
* macosx/Makefile: fix/add copyright and license refs.
* macosx/tclMacOSXBundle.c:
* macosx/Tcl-Info.plist.in:
Diffstat (limited to 'macosx/Makefile')
| -rw-r--r-- | macosx/Makefile | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/macosx/Makefile b/macosx/Makefile index 8ec7027..a8acc28 100644 --- a/macosx/Makefile +++ b/macosx/Makefile @@ -4,7 +4,12 @@ # uses the standard unix build system in tcl/unix (which can be used directly instead of this # if you are not using the tk/macosx projects). # -# RCS: @(#) $Id: Makefile,v 1.5.2.16 2006/10/16 17:34:42 das Exp $ +# Copyright (c) 2002-2007 Daniel A. Steffen <das@users.sourceforge.net> +# +# See the file "license.terms" for information on usage and redistribution of +# this file, and for a DISCLAIMER OF ALL WARRANTIES. +# +# RCS: @(#) $Id: Makefile,v 1.5.2.17 2007/04/29 02:21:33 das Exp $ # ######################################################################################################## @@ -18,8 +23,8 @@ BUILD_DIR ?= ${CURDIR}/../../build SYMROOT ?= ${BUILD_DIR}/${PROJECT} OBJROOT ?= ${SYMROOT} -EXTRA_CONFIGURE_ARGS ?= -EXTRA_MAKE_ARGS ?= +EXTRA_CONFIGURE_ARGS ?= +EXTRA_MAKE_ARGS ?= INSTALL_PATH ?= /Library/Frameworks PREFIX ?= /usr/local @@ -28,12 +33,12 @@ LIBDIR ?= ${INSTALL_PATH} MANDIR ?= ${PREFIX}/man # set to non-empty value to install manpages in addition to html help: -INSTALL_MANPAGES ?= +INSTALL_MANPAGES ?= #------------------------------------------------------------------------------------------------------- # meta targets -meta := all install embedded install-embedded clean distclean test +meta := all install embedded install-embedded clean distclean test styles := develop deploy @@ -75,7 +80,7 @@ deploy_make_args := BUILD_STYLE=Deployment INSTALL_TARGET=install-strip \ embedded_make_args := EMBEDDED_BUILD=1 install_make_args := INSTALL_BUILD=1 -${targets}: +${targets}: ${MAKE} ${action}${PROJECT} \ $(foreach s,${styles} embedded install,$(if $(findstring $s,$@),${${s}_make_args})) @@ -122,7 +127,7 @@ ${PROJECT}: ${MAKE} install-${PROJECT} INSTALL_ROOT=${OBJ_DIR}/ ${OBJ_DIR}/Makefile: ${UNIX_DIR}/Makefile.in ${UNIX_DIR}/configure \ - ${UNIX_DIR}/tclConfig.sh.in Tcl-Info.plist.in + ${UNIX_DIR}/tclConfig.sh.in Tcl-Info.plist.in mkdir -p ${OBJ_DIR} && cd ${OBJ_DIR} && \ if [ ${UNIX_DIR}/configure -nt config.status ]; then ${UNIX_DIR}/configure \ --prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} \ @@ -188,7 +193,7 @@ clean-${PROJECT}: %-${PROJECT}: distclean-${PROJECT}: %-${PROJECT}: clean-${PROJECT} ${DO_MAKE} rm -rf ${OBJ_DIR} - + test-${PROJECT}: %-${PROJECT}: build-${PROJECT} ${DO_MAKE} |