diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-17 22:24:10 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-22 11:08:29 +0200 |
| commit | d343c57f982af1b2a9a37362e82e7369b6edf948 (patch) | |
| tree | 605acc30b2923a5ad609f82791f4bf4500a739bc /cppu | |
| parent | d263c22a0924ece4663c023618bba93fcb7300c3 (diff) | |
gbuild: make the versioned library the linktarget on Unixes
If there is a SOVERSION then the versioned library is a real file and
the unversioned one just a symlink; better to have the real file be the
target.
- add gb_Library_UDK_MAJORVER variable for SOVERSION
- remove version parameter of gb_Library_set_soversion_script;
instead hardcode the SOVERSION since it must be included in the
file name in gb_Library_FILENAMES anyway
- store the unversioned symlink in the ILIBTARGET variable
- via new gb_Library_get_workdir_target_versionlink function
- removed gb_Helper_install call that resulted in both versioned
and unversioned libs in instdir
Change-Id: I2c6f1698f0e39fdb2c07964d43ed9485cbca0b30
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/Library_cppu.mk | 2 | ||||
| -rw-r--r-- | cppu/Library_purpenvhelper.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk index a4dd49a508c2..eacaf83e9f1f 100644 --- a/cppu/Library_cppu.mk +++ b/cppu/Library_cppu.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Library_Library,cppu)) -$(eval $(call gb_Library_set_soversion_script,cppu,3,$(SRCDIR)/cppu/util/cppu.map)) +$(eval $(call gb_Library_set_soversion_script,cppu,$(SRCDIR)/cppu/util/cppu.map)) $(eval $(call gb_Library_use_udk_api,cppu)) diff --git a/cppu/Library_purpenvhelper.mk b/cppu/Library_purpenvhelper.mk index 4fc24acae5ad..4b4733534ca6 100644 --- a/cppu/Library_purpenvhelper.mk +++ b/cppu/Library_purpenvhelper.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Library_Library,purpenvhelper)) -$(eval $(call gb_Library_set_soversion_script,purpenvhelper,3,$(SRCDIR)/cppu/util/uno_purpenvhelpergcc3.map)) +$(eval $(call gb_Library_set_soversion_script,purpenvhelper,$(SRCDIR)/cppu/util/uno_purpenvhelpergcc3.map)) $(eval $(call gb_Library_add_defs,purpenvhelper,\ -DPURPENV_DLLIMPLEMENTATION \ |