diff options
author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-05-25 12:46:50 +0000 |
---|---|---|
committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-05-25 12:46:50 +0000 |
commit | f655ec78637e15ee61c40071f4615c68b4998f0b (patch) | |
tree | f4faf17cdbef76e6f199847b133727b08bcfa332 | |
parent | a5d50a614abd2289f043f7dbbae0d352e96c692f (diff) | |
download | ATCD-f655ec78637e15ee61c40071f4615c68b4998f0b.tar.gz |
ChangeLogTag:Sun May 25 12:51:58 UTC 2003 Don Hinton <dhinton@dresystems.com>
-rw-r--r-- | TAO/ChangeLog | 7 | ||||
-rw-r--r-- | TAO/taoconfig.mk | 2 |
2 files changed, 8 insertions, 1 deletions
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 <dhinton@dresystems.com> + + * 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 <jwillemsen@remedy.nl> * 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) |