From bfb359fd22e61faaca3a6e49ad3b7a81f2d71551 Mon Sep 17 00:00:00 2001
From: "N.N." <krzyszcz@users.sourceforge.net>
Date: Thu, 27 Jan 2005 14:42:55 +0000
Subject: cyclone alpha52 and toxy alpha15 (see notes.txt for cyclone, toxy and
 shared)

svn path=/trunk/externals/miXed/; revision=2550
---
 Makefile.common | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'Makefile.common')

diff --git a/Makefile.common b/Makefile.common
index aec8e9e..018a5ef 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1,12 +1,6 @@
 # next line has to be edited manually
 PD_DIR = $(ROOT_DIR)/../../pd/src
 
-# remove this restriction LATER, when TCL_LIB is ./configured
-ifeq ($(shell whoami),krzYszcz)
-# TCL_LIB should be set (or not) before "include Makefile.sources"
-TCL_LIB = -l$(shell grep -osm1 'tcl8\.[345]' $(PD_DIR)/makefile)
-endif
-
 OS_NAME = $(shell uname -s)
 ifneq ($(OS_NAME),Linux)
 ifneq ($(OS_NAME),Darwin)
@@ -22,6 +16,14 @@ endif
 endif
 endif
 
+MY_NAME = $(shell id -un)
+
+# remove this restriction LATER, when TCL_LIB is ./configured
+ifeq ($(MY_NAME),krzYszcz)
+# TCL_LIB should be set (or not) before "include Makefile.sources"
+TCL_LIB = -l$(shell grep -osm1 'tcl8\.[345]' $(PD_DIR)/makefile)
+endif
+
 TILDE = ~
 
 -include Makefile.dirs
@@ -36,7 +38,7 @@ CC = gcc
 LFLAGS = -export_dynamic  -shared
 # FIXME strict-aliasing
 OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer -fno-strict-aliasing
-ifeq ($(shell whoami),krzYszcz)
+ifeq ($(MY_NAME),krzYszcz)
 DEFINES = -DUNIX -DKRZYSZCZ
 else
 DEFINES = -DUNIX
@@ -98,7 +100,7 @@ SOURCES = $(CX_SOURCES) $(AX_SOURCES) $(LX_SOURCES) $(OTHER_SOURCES) \
 
 INCLUDES = -I. -I$(PD_DIR) -I$(SHARED_DIR)
 
-ifeq ($(shell whoami),krzYszcz)
+ifeq ($(MY_NAME),krzYszcz)
 WARN_CFLAGS = -Wall -W -Wstrict-prototypes -Werror \
 	-Wno-unused -Wno-parentheses -Wno-switch
 else
@@ -213,7 +215,7 @@ SUBDIRS_DEFAULT = @for i in $(MIXED_DIRS) and_in_case_it_is_null ; \
 			cd $$i; $(MAKE) ; fi ) ; done
 
 define_build:
-	@if [[ -f build_counter && `whoami` == krzYszcz && \
+	@if [[ -f build_counter && `id -un` == krzYszcz && \
 		`date -r build_counter +%j` != `date +%j` ]] ; then \
 		mv build_counter build_counter~ ; \
 		echo -n 'increment build counter (y/n)? [n]' ; read doit ; \
-- 
cgit v1.2.1