diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-01-06 10:48:43 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-01-10 14:25:03 +0100 |
| commit | a74627d53eea219ceb26ce0d341cdf218ed0dd0a (patch) | |
| tree | 33beadd766307b56a6c54227072aa9b099ea9eed /Library_merged.mk | |
| parent | 0ffc8c0d70860e1da3b71eb3ffbb30a0d463ddef (diff) | |
improve support for merging libraries
Diffstat (limited to 'Library_merged.mk')
| -rw-r--r-- | Library_merged.mk | 32 |
1 files changed, 5 insertions, 27 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 4a8ccafbfc63..9fe9c2d012ff 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -21,26 +21,16 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. - $(eval $(call gb_Library_Library,merged)) -$(eval $(call gb_Library_add_linked_libs,merged,$(filter-out $(gb_MERGED_LIBS),\ - avmedia \ +$(eval $(call gb_Library_add_linked_libs,merged,\ basegfx \ - canvastools \ comphelper \ - cppcanvas \ cppu \ cppuhelper \ - drawinglayer \ - editeng \ fwe \ i18nisolang1 \ i18npaper \ - i18nutil \ - jvmfwk \ - lng \ - fwe \ sal \ salhelper \ sax \ @@ -49,28 +39,24 @@ $(eval $(call gb_Library_add_linked_libs,merged,$(filter-out $(gb_MERGED_LIBS),\ sot \ svl \ svt \ - svx \ - svxcore \ tk \ tl \ ucbhelper \ utl \ vcl \ - xo \ xcr \ $(gb_STDLIBS) \ -))) +)) $(eval $(call gb_Library_use_externals,merged,\ - icui18n \ + berkeleydb \ icuuc \ - jpeg \ - libxml2 \ zlib \ )) +# gb_MERGEDLIBS is defined in solenv/gbuild/extensions/pre_MergedLibsList.mk $(eval $(call gb_Library_add_library_objects,merged,\ - $(gb_CORE_LIBS) \ + $(gb_MERGEDLIBS) \ )) ifeq ($(OS),WNT) @@ -85,12 +71,4 @@ $(eval $(call gb_Library_add_linked_libs,merged,\ )) endif -# something is missing here for sure -ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_add_linked_libs,merged,\ - objc \ - Cocoa \ -)) -endif - # vim: set noet sw=4 ts=4: |