Skip to content

C
core
Kaydet (Commit) e7d4e621 authored tarafından Peter Foley's avatar Peter Foley
Dosyalara gözat
Seçenekler

add tl and basegfx to libmerged 

Change-Id: Ie16a3208dd6cc6f0d4fe8e3017b2bf7abc192ecd
üst 95215327
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
Library_merged.mk
Dosyayı görüntüle @ e7d4e621
...@@ -29,7 +29,6 @@ $(eval $(call gb_Library_use_library_objects,merged,\ ...@@ -29,7 +29,6 @@ $(eval $(call gb_Library_use_library_objects,merged,\
)) ))
$(eval $(call gb_Library_use_libraries,merged,\ $(eval $(call gb_Library_use_libraries,merged,\
basegfx \
comphelper \ comphelper \
cppu \ cppu \
cppuhelper \ cppuhelper \
...@@ -39,7 +38,6 @@ $(eval $(call gb_Library_use_libraries,merged,\ ...@@ -39,7 +38,6 @@ $(eval $(call gb_Library_use_libraries,merged,\
jvmfwk) \ jvmfwk) \
sal \ sal \
salhelper \ salhelper \
tl \
ucbhelper \ ucbhelper \
xmlreader \ xmlreader \
$(gb_UWINAPI) \ $(gb_UWINAPI) \
......
solenv/gbuild/LinkTarget.mk
Dosyayı görüntüle @ e7d4e621
...@@ -837,7 +837,7 @@ $(call gb_LinkTarget_get_external_headers_target,$(1)) : \ ...@@ -837,7 +837,7 @@ $(call gb_LinkTarget_get_external_headers_target,$(1)) : \
endef endef
define gb_Linktarget__is_build_tool define gb_Linktarget__is_build_tool
$(if $(filter $(1),$(addprefix Executable/,cppumaker idlc regcompare regmerge)),$(true),$(false)) $(if $(filter $(1),$(addprefix Executable/,cppumaker idlc regcompare regmerge rsc svidl)),$(true),$(false))
endef endef
define gb_LinkTarget_use_libraries define gb_LinkTarget_use_libraries
......
solenv/gbuild/extensions/pre_MergedLibsList.mk
Dosyayı görüntüle @ e7d4e621
...@@ -102,6 +102,7 @@ gb_EXTRAMERGEDLIBS := \ ...@@ -102,6 +102,7 @@ gb_EXTRAMERGEDLIBS := \
# we link all object files from these libraries into one, merged library # we link all object files from these libraries into one, merged library
gb_MERGEDLIBS := \ gb_MERGEDLIBS := \
avmedia \ avmedia \
basegfx \
canvastools \ canvastools \
configmgr \ configmgr \
cppcanvas \ cppcanvas \
...@@ -134,6 +135,7 @@ gb_MERGEDLIBS := \ ...@@ -134,6 +135,7 @@ gb_MERGEDLIBS := \
svx \ svx \
svxcore \ svxcore \
tk \ tk \
tl \
$(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \ $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \
ucb1 \ ucb1 \
ucpfile1 \ ucpfile1 \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment