diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-04-01 20:49:35 +0000 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 09:55:38 +0200 |
| commit | 990111d87aa2589a93455828aa59352ba7ee25d2 (patch) | |
| tree | 29b07fbc1819863f8964bf5b267c2e7cc647a9a7 /svtools | |
| parent | f3ef6ed5400ae3cb024a889a9688cf52f2eccab7 (diff) | |
gnumake4: #i117610#: add RepositoryExternal.mk, and use it. [hg:62e2f8dc95a7]
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/Library_svt.mk | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index c7dab0f17746..a06a238bcce3 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -58,7 +58,6 @@ $(eval $(call gb_Library_add_linked_libs,svt,\ cppuhelper \ i18nisolang1 \ i18nutil \ - icuuc \ jvmfwk \ sal \ sot \ @@ -73,18 +72,10 @@ $(eval $(call gb_Library_add_linked_libs,svt,\ $(gb_STDLIBS) \ )) -ifeq ($(SYSTEM_JPEG),YES) -$(eval $(call gb_Library_add_linked_libs,svt,\ +$(call gb_Library_use_externals,svt,\ + icuuc \ jpeg \ -)) -$(eval $(call gb_Library_set_ldflags,svt,\ - $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \ -)) -else -$(eval $(call gb_Library_add_linked_static_libs,svt,\ - jpeglib \ -)) -endif +) $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/brwbox/brwbox1 \ |