diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-12-09 01:43:03 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-12-09 01:43:03 +0000 |
| commit | 2a24705bc4e886e079605e5ad4cba70c680e9d34 (patch) | |
| tree | 420161a6349b8b99c1a1270ca9dc15b8e22b1466 /TAO/rules.tao.GNU | |
| parent | 2f6bae3887fa3ad28ba7cbfe2bc519fc2561c523 (diff) | |
| download | ATCD-2a24705bc4e886e079605e5ad4cba70c680e9d34.tar.gz | |
ChangeLogTag:Mon Dec 8 19:44:04 UTC 2003 Don Hinton <dhinton@dresystems.com>
Diffstat (limited to 'TAO/rules.tao.GNU')
| -rw-r--r-- | TAO/rules.tao.GNU | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU index 3b646df1bbf..5adce5682cb 100644 --- a/TAO/rules.tao.GNU +++ b/TAO/rules.tao.GNU @@ -219,12 +219,16 @@ TAO_MINOR_VERSION := $(shell awk '/TAO_MINOR_VERSION/ { print $$3}' ${TAO_ROOT}/ TAO_BETA_VERSION := $(shell awk '/TAO_BETA_VERSION/ { print $$3}' ${TAO_ROOT}/tao/Version.h) # Version number of the libraries # -ifneq ($(SOVERSION),) - SOVERSION = .$(TAO_MAJOR_VERSION).$(TAO_MINOR_VERSION).$(TAO_BETA_VERSION) -endif - -# Name that will be written into the dynamic library -# -ifneq ($(SONAME),) -SONAME = $(SHLIB).$(TAO_MAJOR_VERSION).$(TAO_MINOR_VERSION).$(TAO_BETA_VERSION) -endif +ifeq ($(versioned_so),1) + # Only set SOVERSION for TAO if versioning is turned on and SOVERION is + # blank, which gives users to ability to override it. + ifeq ($(SOVERSION),) + SOVERSION = .$(TAO_MAJOR_VERSION).$(TAO_MINOR_VERSION).$(TAO_BETA_VERSION) + endif # SOVERSION + + # Name that will be written into the dynamic library + # + ifneq ($(SONAME),) + SONAME = $(SHLIB).$(TAO_MAJOR_VERSION).$(TAO_MINOR_VERSION).$(TAO_BETA_VERSION) + endif # SONAME +endif # versioned_so |