From f655ec78637e15ee61c40071f4615c68b4998f0b Mon Sep 17 00:00:00 2001 From: dhinton Date: Sun, 25 May 2003 12:46:50 +0000 Subject: ChangeLogTag:Sun May 25 12:51:58 UTC 2003 Don Hinton --- TAO/ChangeLog | 7 +++++++ TAO/taoconfig.mk | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 926b6b0fe47..e6996bcf2db 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Sun May 25 12:51:58 UTC 2003 Don Hinton + + * taoconfig.mk: + Just add -L$(TAO_ROOT)/tao to LDFLAGS instead of using patsubst + because patsubst evaluates variables which means you can't embed + things like $@. + Sun May 25 09:06:12 UTC 2003 Johnny Willemsen * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp: diff --git a/TAO/taoconfig.mk b/TAO/taoconfig.mk index b86e2b70c3e..50372b861d2 100644 --- a/TAO/taoconfig.mk +++ b/TAO/taoconfig.mk @@ -9,5 +9,5 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDFLAGS := $(patsubst -L$(ACE_ROOT)/ace, -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace, $(LDFLAGS)) +LDFLAGS += -L$(TAO_ROOT)/tao INCLDIRS += -I$(TAO_ROOT) -- cgit v1.2.1