diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-09 17:34:43 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-10 22:52:56 +0200 |
| commit | 3fdb77f0827d374a7fa2f1e232920b6174d6b44b (patch) | |
| tree | b97e714c5940ea712d29a80943f69394af288b78 /scp2 | |
| parent | 2c8cc6e5c600d04ae545af9f9223b88c3a757eee (diff) | |
add new urelibs library merging some libraries from ure/lib/
There is no configure switch for this, URELIBS must be set.
This commit changes strategy to link also libraries being merged.
We need them for build tools like idlc, cppumaker, .., so the tools can
link against them now. This avoids circular dependencies.
Change-Id: Ic49e18ecbeaff84d4f5a7fafe8b1fbf45ed18c9b
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_ure.mk | 1 | ||||
| -rwxr-xr-x | scp2/source/ooo/ure.scp | 12 |
2 files changed, 12 insertions, 1 deletions
diff --git a/scp2/InstallModule_ure.mk b/scp2/InstallModule_ure.mk index 4a5d9cdd56b4..f98581695375 100644 --- a/scp2/InstallModule_ure.mk +++ b/scp2/InstallModule_ure.mk @@ -29,6 +29,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/ure)) $(eval $(call gb_InstallModule_define_if_set,scp2/ure,\ SYSTEM_LIBXML \ + URELIBS \ )) $(eval $(call gb_InstallModule_define_value_if_set,scp2/ure,\ diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 9c9ce858339c..5e6d681512a3 100755 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -291,7 +291,14 @@ File gid_File_Dl_Xmlreader Styles = (PACKED); End - +#ifdef URELIBS +File gid_File_Dl_Urelibs + LIB_FILE_BODY; + Dir = SCP2_URE_DL_DIR; + Name = SCP2_URE_DL_NORMAL("urelibs"); + Styles = (PACKED); +End +#endif #ifdef AIX Unixlink gid_Unixlink_File_Dl_Store @@ -1007,6 +1014,9 @@ Module gid_Module_Root_Ure_Hidden gid_Unixlink_File_Dl_Store, gid_File_Dl_Unoidl, gid_File_Dl_Xmlreader, +#ifdef URELIBS + gid_File_Dl_Urelibs, +#endif gid_File_Dl_Jvmaccess, gid_Unixlink_File_Dl_Jvmaccess, gid_File_Dl_Jvmfwk, |