diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-26 20:42:09 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-28 09:58:04 -0400 |
| commit | 3c8f17930eeacb7250ecfc01cbf557e50234e307 (patch) | |
| tree | e6bd259cd970c787023ec98fbbc69e972dea43f2 /solenv | |
| parent | 49d8bc1dcce4c662d85d894567501205f94f678d (diff) | |
add desktop_detector, subsequenttest, test, and vclplug_svp to Library_merged
Change-Id: Ic2201436d1e4fe01670e2086e7dd1c6c525c9e91
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 2217014050d3..60f71d726a6e 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -39,6 +39,7 @@ gb_MERGEDLIBS := \ $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \ deploymentmisc \ + $(if $(filter unx,$(GUIBASE)),desktop_detector) \ desktopbe1 \ drawinglayer \ editeng \ @@ -70,12 +71,14 @@ gb_MERGEDLIBS := \ sofficeapp \ sot \ spl \ + subsequenttest \ svl \ svt \ svx \ svxcore \ sw \ swd \ + test \ tk \ $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \ ucb1 \ @@ -84,6 +87,7 @@ gb_MERGEDLIBS := \ uui \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ vcl \ + $(if $(filter unx,$(GUIBASE)),vclplug_svp) \ $(if $(filter-out IOS,$(OS)),wpftdraw) \ $(if $(filter-out IOS,$(OS)),wpftwriter) \ writerfilter \ |