diff options
| -rw-r--r-- | Library_merged.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 2e482e8d91e5..49dcbb5c0c40 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -16,7 +16,6 @@ $(eval $(call gb_Library_use_library_objects,merged,\ )) $(eval $(call gb_Library_use_libraries,merged,\ - comphelper \ cppu \ cppuhelper \ i18nlangtag \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 6af790c80dda..d9a97a1d4859 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -818,6 +818,7 @@ endef # libraries which are merged but need to be built for gb_BUILD_HELPER_TOOLS gb_BUILD_HELPER_LIBS := basegfx \ + comphelper \ cppu \ cppuhelper \ reg \ diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 97953eed736a..c9275f4679ee 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -14,6 +14,7 @@ MERGE_LIBRARY_LIST := \ $(if $(filter $(OS),ANDROID),,basebmp) \ basegfx \ canvastools \ + comphelper \ configmgr \ cppcanvas \ $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \ |