From 4108d5e746022cd525e93215aeb41eb0a1ab3b7a Mon Sep 17 00:00:00 2001
From: das <das>
Date: Tue, 22 Nov 2005 20:22:08 +0000
Subject: Renamed Makefile to GNUmakefile

---
 macosx/GNUmakefile | 196 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 macosx/Makefile    | 196 -----------------------------------------------------
 2 files changed, 196 insertions(+), 196 deletions(-)
 create mode 100644 macosx/GNUmakefile
 delete mode 100644 macosx/Makefile

diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile
new file mode 100644
index 0000000..6bd305d
--- /dev/null
+++ b/macosx/GNUmakefile
@@ -0,0 +1,196 @@
+########################################################################################################
+#
+# Makefile wrapper to build tcl on Mac OS X in a way compatible with the tk/macosx Xcode buildsystem
+#	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: GNUmakefile,v 1.1 2005/11/22 20:22:08 das Exp $
+#
+########################################################################################################
+
+#-------------------------------------------------------------------------------------------------------
+# customizable settings
+
+DESTDIR			?=
+INSTALL_ROOT		?= ${DESTDIR}
+
+BUILD_DIR		?= ${CURDIR}/../../build
+SYMROOT			?= ${BUILD_DIR}/${PROJECT}
+OBJROOT			?= ${SYMROOT}
+
+EXTRA_CONFIGURE_ARGS 	?= 
+EXTRA_MAKE_ARGS		?= 
+
+INSTALL_PATH		?= /Library/Frameworks
+PREFIX			?= /usr/local
+BINDIR			?= ${PREFIX}/bin
+LIBDIR			?= ${INSTALL_PATH}
+MANDIR			?= ${PREFIX}/man
+
+# set to non-empty value to install manpages in addition to html help:
+INSTALL_MANPAGES 	?= 
+
+#-------------------------------------------------------------------------------------------------------
+# meta targets
+
+meta 			:= all install embedded install-embedded clean distclean test
+
+styles			:= develop deploy
+
+all			:= ${styles}
+all			: ${all}
+
+install			:= ${styles:%=install-%}
+install			: ${install}
+install-%:		action := install-
+
+embedded		:= ${styles:%=embedded-%}
+embedded		: embedded-deploy
+install-embedded	:= ${embedded:%=install-%}
+install-embedded	: install-embedded-deploy
+
+clean			:= ${styles:%=clean-%}
+clean			: ${clean}
+clean-%:		action := clean-
+distclean		:= ${styles:%=distclean-%}
+distclean		: ${distclean}
+distclean-%:		action := distclean-
+
+test			:= ${styles:%=test-%}
+test			: ${test}
+test-%:			action := test-
+
+targets			:= $(foreach v,${meta},${$v})
+
+#-------------------------------------------------------------------------------------------------------
+# build styles
+
+BUILD_STYLE		=
+CONFIGURE_ARGS		=
+OBJ_DIR			= ${OBJROOT}/${BUILD_STYLE}
+
+develop_make_args	:= BUILD_STYLE=Development CONFIGURE_ARGS=--enable-symbols
+deploy_make_args	:= BUILD_STYLE=Deployment INSTALL_TARGET=install-strip \
+			   GENERIC_FLAGS=-DNDEBUG
+embedded_make_args	:= EMBEDDED_BUILD=1
+install_make_args	:= INSTALL_BUILD=1
+
+${targets}: 
+	${MAKE} ${action}${PROJECT} \
+	$(foreach s,${styles} embedded install,$(if $(findstring $s,$@),${${s}_make_args}))
+
+#-------------------------------------------------------------------------------------------------------
+# project specific settings
+
+PROJECT			:= tcl
+PRODUCT_NAME		:= Tcl
+
+UNIX_DIR		:= ${CURDIR}/../unix
+VERSION			:= $(shell awk -F= '/^TCL_VERSION/ {print $$2; nextfile}' ${UNIX_DIR}/configure.in)
+TCLSH			:= tclsh${VERSION}
+
+BUILD_TARGET		:= tclsh tcltest
+INSTALL_TARGET		:= install
+
+override GENERIC_FLAGS	:= ${GENERIC_FLAGS} -DTCL_IO_TRACK_OS_FOR_DRIVER_WITH_BAD_BLOCKING
+export CPPROG		:= cp -p
+
+INSTALL_TARGETS		= install-binaries install-libraries
+ifeq (${EMBEDDED_BUILD},)
+INSTALL_TARGETS		+= install-private-headers
+endif
+ifeq (${INSTALL_BUILD}_${EMBEDDED_BUILD}_${BUILD_STYLE},1__Deployment)
+INSTALL_TARGETS		+= html-tcl
+ifneq (${INSTALL_MANPAGES},)
+INSTALL_TARGETS		+= install-doc
+endif
+endif
+
+MAKE_VARS		:= INSTALL_ROOT INSTALL_TARGETS VERSION GENERIC_FLAGS
+MAKE_ARGS_V		= $(foreach v,${MAKE_VARS},$v='${$v}')
+
+build-${PROJECT}:	target = ${TARGET}
+install-${PROJECT}:	target = ${INSTALL_TARGET}
+clean-${PROJECT} distclean-${PROJECT} test-${PROJECT}: \
+			target = $*
+
+DO_MAKE			= +${MAKE} -C ${OBJ_DIR} ${target} ${MAKE_ARGS_V} ${MAKE_ARGS} ${EXTRA_MAKE_ARGS}
+
+#-------------------------------------------------------------------------------------------------------
+# build rules
+
+${PROJECT}:
+	${MAKE} install-${PROJECT} INSTALL_ROOT=${OBJ_DIR}/
+
+${OBJ_DIR}/Makefile: ${UNIX_DIR}/Makefile.in ${UNIX_DIR}/configure
+	mkdir -p ${OBJ_DIR} && cd ${OBJ_DIR} && ${UNIX_DIR}/configure -C \
+	--prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} \
+	--mandir=${MANDIR} --enable-threads --enable-framework \
+	${CONFIGURE_ARGS} ${EXTRA_CONFIGURE_ARGS}
+
+build-${PROJECT}: ${OBJ_DIR}/Makefile
+	${DO_MAKE}
+# symolic link hackery to trick
+# 'make install INSTALL_ROOT=${OBJ_DIR}'
+# into building Tcl.framework and tclsh in ${SYMROOT}
+	@cd ${OBJ_DIR} && mkdir -p $(dir ./${LIBDIR}) $(dir ./${BINDIR}) ${SYMROOT} && \
+	rm -f ./${LIBDIR} ./${BINDIR} && ln -fs ${SYMROOT} ./${LIBDIR} && \
+	ln -fs ${SYMROOT} ./${BINDIR} && ln -fs ${OBJ_DIR}/tcltest ${SYMROOT}
+
+install-${PROJECT}: build-${PROJECT}
+ifeq (${EMBEDDED_BUILD}_${INSTALL_ROOT},1_)
+	@echo "Cannot install-embedded with empty INSTALL_ROOT !" && false
+endif
+ifeq (${EMBEDDED_BUILD},1)
+	@rm -rf "${INSTALL_ROOT}/${LIBDIR}/Tcl.framework"
+endif
+	${DO_MAKE}
+ifeq (${INSTALL_BUILD},1)
+ifeq (${EMBEDDED_BUILD},1)
+# if we are embedding frameworks, don't install tclsh
+	@rm -f "${INSTALL_ROOT}${BINDIR}/${TCLSH}" && \
+	rmdir -p "${INSTALL_ROOT}${BINDIR}" 2>&- || true
+else
+# redo prebinding
+	@cd ${INSTALL_ROOT}/ && \
+	if [ ! -d usr/lib ]; then mkdir -p usr && ln -fs /usr/lib usr/ && RM_USRLIB=1; fi; \
+	if [ ! -d System ]; then ln -fs /System . && RM_SYSTEM=1; fi; \
+	redo_prebinding -r . "./${LIBDIR}/${PRODUCT_NAME}.framework/Versions/${VERSION}/${PRODUCT_NAME}"; \
+	redo_prebinding -r . "./${BINDIR}/${TCLSH}"; \
+	if [ -n "$${RM_USRLIB:-}" ]; then rm -f usr/lib; rmdir -p usr 2>&-; fi; \
+	if [ -n "$${RM_SYSTEM:-}" ]; then rm -f System; fi
+# install tclsh symbolic link
+	@ln -fs ${TCLSH} ${INSTALL_ROOT}${BINDIR}/tclsh
+endif
+endif
+ifeq (${BUILD_STYLE}_${EMBEDDED_BUILD},Development_)
+# keep copy of debug library around, so that
+# Deployment build can be installed on top
+# of Development build without overwriting
+# the debug library
+	@cd ${INSTALL_ROOT}${LIBDIR}/${PRODUCT_NAME}.framework/Versions/${VERSION} && \
+	ln -f "${PRODUCT_NAME}" "${PRODUCT_NAME}_debug"
+endif
+
+clean-${PROJECT}: %-${PROJECT}:
+	${DO_MAKE}
+	rm -rf ${SYMROOT}/{${PRODUCT_NAME}.framework,${TCLSH},tcltest}
+	rm -f ${OBJ_DIR}{${LIBDIR},${BINDIR}} && \
+	rmdir -p ${OBJ_DIR}$(dir ${LIBDIR}) 2>&- || true && \
+	rmdir -p ${OBJ_DIR}$(dir ${BINDIR}) 2>&- || true
+
+distclean-${PROJECT}: %-${PROJECT}: clean-${PROJECT}
+	${DO_MAKE}
+	rm -rf ${OBJ_DIR}
+	
+test-${PROJECT}: %-${PROJECT}: build-${PROJECT}
+	${DO_MAKE}
+
+#-------------------------------------------------------------------------------------------------------
+
+.PHONY: ${meta} ${targets} ${PROJECT} build-${PROJECT} install-${PROJECT} \
+	clean-${PROJECT} distclean-${PROJECT}
+
+.NOTPARALLEL:
+
+#-------------------------------------------------------------------------------------------------------
diff --git a/macosx/Makefile b/macosx/Makefile
deleted file mode 100644
index 7195e77..0000000
--- a/macosx/Makefile
+++ /dev/null
@@ -1,196 +0,0 @@
-########################################################################################################
-#
-# Makefile wrapper to build tcl on Mac OS X in a way compatible with the tk/macosx Xcode buildsystem
-#	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.22 2005/06/03 08:52:16 das Exp $
-#
-########################################################################################################
-
-#-------------------------------------------------------------------------------------------------------
-# customizable settings
-
-DESTDIR			?=
-INSTALL_ROOT		?= ${DESTDIR}
-
-BUILD_DIR		?= ${CURDIR}/../../build
-SYMROOT			?= ${BUILD_DIR}/${PROJECT}
-OBJROOT			?= ${SYMROOT}
-
-EXTRA_CONFIGURE_ARGS 	?= 
-EXTRA_MAKE_ARGS		?= 
-
-INSTALL_PATH		?= /Library/Frameworks
-PREFIX			?= /usr/local
-BINDIR			?= ${PREFIX}/bin
-LIBDIR			?= ${INSTALL_PATH}
-MANDIR			?= ${PREFIX}/man
-
-# set to non-empty value to install manpages in addition to html help:
-INSTALL_MANPAGES 	?= 
-
-#-------------------------------------------------------------------------------------------------------
-# meta targets
-
-meta 			:= all install embedded install-embedded clean distclean test
-
-styles			:= develop deploy
-
-all			:= ${styles}
-all			: ${all}
-
-install			:= ${styles:%=install-%}
-install			: ${install}
-install-%:		action := install-
-
-embedded		:= ${styles:%=embedded-%}
-embedded		: embedded-deploy
-install-embedded	:= ${embedded:%=install-%}
-install-embedded	: install-embedded-deploy
-
-clean			:= ${styles:%=clean-%}
-clean			: ${clean}
-clean-%:		action := clean-
-distclean		:= ${styles:%=distclean-%}
-distclean		: ${distclean}
-distclean-%:		action := distclean-
-
-test			:= ${styles:%=test-%}
-test			: ${test}
-test-%:			action := test-
-
-targets			:= $(foreach v,${meta},${$v})
-
-#-------------------------------------------------------------------------------------------------------
-# build styles
-
-BUILD_STYLE		=
-CONFIGURE_ARGS		=
-OBJ_DIR			= ${OBJROOT}/${BUILD_STYLE}
-
-develop_make_args	:= BUILD_STYLE=Development CONFIGURE_ARGS=--enable-symbols
-deploy_make_args	:= BUILD_STYLE=Deployment INSTALL_TARGET=install-strip \
-			   GENERIC_FLAGS=-DNDEBUG
-embedded_make_args	:= EMBEDDED_BUILD=1
-install_make_args	:= INSTALL_BUILD=1
-
-${targets}: 
-	${MAKE} ${action}${PROJECT} \
-	$(foreach s,${styles} embedded install,$(if $(findstring $s,$@),${${s}_make_args}))
-
-#-------------------------------------------------------------------------------------------------------
-# project specific settings
-
-PROJECT			:= tcl
-PRODUCT_NAME		:= Tcl
-
-UNIX_DIR		:= ${CURDIR}/../unix
-VERSION			:= $(shell awk -F= '/^TCL_VERSION/ {print $$2; nextfile}' ${UNIX_DIR}/configure.in)
-TCLSH			:= tclsh${VERSION}
-
-BUILD_TARGET		:= tclsh tcltest
-INSTALL_TARGET		:= install
-
-override GENERIC_FLAGS	:= ${GENERIC_FLAGS} -DTCL_IO_TRACK_OS_FOR_DRIVER_WITH_BAD_BLOCKING
-export CPPROG		:= cp -p
-
-INSTALL_TARGETS		= install-binaries install-libraries
-ifeq (${EMBEDDED_BUILD},)
-INSTALL_TARGETS		+= install-private-headers
-endif
-ifeq (${INSTALL_BUILD}_${EMBEDDED_BUILD}_${BUILD_STYLE},1__Deployment)
-INSTALL_TARGETS		+= html-tcl
-ifneq (${INSTALL_MANPAGES},)
-INSTALL_TARGETS		+= install-doc
-endif
-endif
-
-MAKE_VARS		:= INSTALL_ROOT INSTALL_TARGETS VERSION GENERIC_FLAGS
-MAKE_ARGS_V		= $(foreach v,${MAKE_VARS},$v='${$v}')
-
-build-${PROJECT}:	target = ${TARGET}
-install-${PROJECT}:	target = ${INSTALL_TARGET}
-clean-${PROJECT} distclean-${PROJECT} test-${PROJECT}: \
-			target = $*
-
-DO_MAKE			= +${MAKE} -C ${OBJ_DIR} ${target} ${MAKE_ARGS_V} ${MAKE_ARGS} ${EXTRA_MAKE_ARGS}
-
-#-------------------------------------------------------------------------------------------------------
-# build rules
-
-${PROJECT}:
-	${MAKE} install-${PROJECT} INSTALL_ROOT=${OBJ_DIR}/
-
-${OBJ_DIR}/Makefile: ${UNIX_DIR}/Makefile.in ${UNIX_DIR}/configure
-	mkdir -p ${OBJ_DIR} && cd ${OBJ_DIR} && ${UNIX_DIR}/configure -C \
-	--prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} \
-	--mandir=${MANDIR} --enable-threads --enable-framework \
-	${CONFIGURE_ARGS} ${EXTRA_CONFIGURE_ARGS}
-
-build-${PROJECT}: ${OBJ_DIR}/Makefile
-	${DO_MAKE}
-# symolic link hackery to trick
-# 'make install INSTALL_ROOT=${OBJ_DIR}'
-# into building Tcl.framework and tclsh in ${SYMROOT}
-	@cd ${OBJ_DIR} && mkdir -p $(dir ./${LIBDIR}) $(dir ./${BINDIR}) ${SYMROOT} && \
-	rm -f ./${LIBDIR} ./${BINDIR} && ln -fs ${SYMROOT} ./${LIBDIR} && \
-	ln -fs ${SYMROOT} ./${BINDIR} && ln -fs ${OBJ_DIR}/tcltest ${SYMROOT}
-
-install-${PROJECT}: build-${PROJECT}
-ifeq (${EMBEDDED_BUILD}_${INSTALL_ROOT},1_)
-	@echo "Cannot install-embedded with empty INSTALL_ROOT !" && false
-endif
-ifeq (${EMBEDDED_BUILD},1)
-	@rm -rf "${INSTALL_ROOT}/${LIBDIR}/Tcl.framework"
-endif
-	${DO_MAKE}
-ifeq (${INSTALL_BUILD},1)
-ifeq (${EMBEDDED_BUILD},1)
-# if we are embedding frameworks, don't install tclsh
-	@rm -f "${INSTALL_ROOT}${BINDIR}/${TCLSH}" && \
-	rmdir -p "${INSTALL_ROOT}${BINDIR}" 2>&- || true
-else
-# redo prebinding
-	@cd ${INSTALL_ROOT}/ && \
-	if [ ! -d usr/lib ]; then mkdir -p usr && ln -fs /usr/lib usr/ && RM_USRLIB=1; fi; \
-	if [ ! -d System ]; then ln -fs /System . && RM_SYSTEM=1; fi; \
-	redo_prebinding -r . "./${LIBDIR}/${PRODUCT_NAME}.framework/Versions/${VERSION}/${PRODUCT_NAME}"; \
-	redo_prebinding -r . "./${BINDIR}/${TCLSH}"; \
-	if [ -n "$${RM_USRLIB:-}" ]; then rm -f usr/lib; rmdir -p usr 2>&-; fi; \
-	if [ -n "$${RM_SYSTEM:-}" ]; then rm -f System; fi
-# install tclsh symbolic link
-	@ln -fs ${TCLSH} ${INSTALL_ROOT}${BINDIR}/tclsh
-endif
-endif
-ifeq (${BUILD_STYLE}_${EMBEDDED_BUILD},Development_)
-# keep copy of debug library around, so that
-# Deployment build can be installed on top
-# of Development build without overwriting
-# the debug library
-	@cd ${INSTALL_ROOT}${LIBDIR}/${PRODUCT_NAME}.framework/Versions/${VERSION} && \
-	ln -f "${PRODUCT_NAME}" "${PRODUCT_NAME}_debug"
-endif
-
-clean-${PROJECT}: %-${PROJECT}:
-	${DO_MAKE}
-	rm -rf ${SYMROOT}/{${PRODUCT_NAME}.framework,${TCLSH},tcltest}
-	rm -f ${OBJ_DIR}{${LIBDIR},${BINDIR}} && \
-	rmdir -p ${OBJ_DIR}$(dir ${LIBDIR}) 2>&- || true && \
-	rmdir -p ${OBJ_DIR}$(dir ${BINDIR}) 2>&- || true
-
-distclean-${PROJECT}: %-${PROJECT}: clean-${PROJECT}
-	${DO_MAKE}
-	rm -rf ${OBJ_DIR}
-	
-test-${PROJECT}: %-${PROJECT}: build-${PROJECT}
-	${DO_MAKE}
-
-#-------------------------------------------------------------------------------------------------------
-
-.PHONY: ${meta} ${targets} ${PROJECT} build-${PROJECT} install-${PROJECT} \
-	clean-${PROJECT} distclean-${PROJECT}
-
-.NOTPARALLEL:
-
-#-------------------------------------------------------------------------------------------------------
-- 
cgit v0.12