diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-06-12 12:39:40 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-06-12 12:39:40 +0000 |
| commit | 88e0d1610a2aac7bad587a085e189d64b3e5ee13 (patch) | |
| tree | 872563a660f0a13a2dea0004c50ee109879b507b /TAO/rules.tao.GNU | |
| parent | 3996025d7e29101f10c74d85e5fd34e7e3a0e11d (diff) | |
| download | ATCD-88e0d1610a2aac7bad587a085e189d64b3e5ee13.tar.gz | |
ChangeLogTag: Sun Jun 12 12:37:12 UTC 2005 Martin Corino <mcorino@remedy.nl>
Diffstat (limited to 'TAO/rules.tao.GNU')
| -rw-r--r-- | TAO/rules.tao.GNU | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU index 93bf455ef12..15740d1a461 100644 --- a/TAO/rules.tao.GNU +++ b/TAO/rules.tao.GNU @@ -32,7 +32,7 @@ ifeq (,$(findstring -I$(TAO_ROOT),$(INCLDIRS))) endif ifeq ($(templates),explicit) - default: + default: echo "ERROR: Explicit templates are not possible to be used with TAO" endif # templates @@ -230,9 +230,15 @@ endif # minor and beta) to run, but applications with dependencies on libraries # with different minor or major or beta versions to fail. # +ifeq (cmd,$(findstring cmd,$(SHELL))) +TAO_MAJOR_VERSION := $(shell awk "/TAO_MAJOR_VERSION/ { print $$3}" ${TAO_ROOT}/tao/Version.h) +TAO_MINOR_VERSION := $(shell awk "/TAO_MINOR_VERSION/ { print $$3}" ${TAO_ROOT}/tao/Version.h) +TAO_BETA_VERSION := $(shell awk "/TAO_BETA_VERSION/ { print $$3}" ${TAO_ROOT}/tao/Version.h) +else TAO_MAJOR_VERSION := $(shell awk '/TAO_MAJOR_VERSION/ { print $$3}' ${TAO_ROOT}/tao/Version.h) TAO_MINOR_VERSION := $(shell awk '/TAO_MINOR_VERSION/ { print $$3}' ${TAO_ROOT}/tao/Version.h) TAO_BETA_VERSION := $(shell awk '/TAO_BETA_VERSION/ { print $$3}' ${TAO_ROOT}/tao/Version.h) +endif # Version number of the libraries # ifeq ($(versioned_so),1) |