diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-09-20 14:16:40 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-09-20 14:24:55 +0300 |
| commit | 4b326ea35cb9193dbb530b9445a778d61bf8273d (patch) | |
| tree | c4dfb5b4a6e4ea1597787bb2082d32a7873164a8 /javaunohelper/Library_juh.mk | |
| parent | e7c9b468f364fd4796f0ff6fc6b76045ad58b26f (diff) | |
No need for the juh/juhx dance when DISABLE_DYNLOADING
Change-Id: Ifc2bfb278947344d14b855ebf5527b603e333f15
Diffstat (limited to 'javaunohelper/Library_juh.mk')
| -rw-r--r-- | javaunohelper/Library_juh.mk | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/javaunohelper/Library_juh.mk b/javaunohelper/Library_juh.mk index 4783bd982a93..13364691be1a 100644 --- a/javaunohelper/Library_juh.mk +++ b/javaunohelper/Library_juh.mk @@ -36,8 +36,19 @@ $(eval $(call gb_Library_use_libraries,juh,\ $(gb_STDLIBS) \ )) +ifneq ($(DISABLE_DYNLOADING),TRUE) $(eval $(call gb_Library_add_exception_objects,juh,\ javaunohelper/source/preload \ )) +else +# In the DISABLE_DYNLOADING case the juh library is a static archive that gets +# linked into the single .so, so we can put directly into it the code that in +# normal cases goes into the juhx library +$(eval $(call gb_Library_add_exception_objects,juh,\ + javaunohelper/source/bootstrap \ + javaunohelper/source/javaunohelper \ + javaunohelper/source/vm \ +)) +endif # vim:set shiftwidth=4 softtabstop=4 expandtab: |