diff options
| author | Peter Foley <pefoley2@verizon.net> | 2011-12-24 09:44:24 -0500 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2011-12-24 09:44:24 -0500 |
| commit | fd6649175956c9d322fe02fd413fe6970aa6819e (patch) | |
| tree | ce2691616f82ef55d3b8f3e45812777477e8668f /RepositoryModule_ooo.mk | |
| parent | 79b252a56db8f1c2159d3269de415ffe2f2d9bb1 (diff) | |
| parent | a8feb5b1df99c12a5cb644097f935e9ccf512ed5 (diff) | |
Merge remote-tracking branch 'origin/master' into feature/gbuild_extensions
Conflicts:
Module_tail_build.mk
Repository.mk
extensions/util/makefile.pmk
postprocess/prj/build.lst
svx/AllLangResTarget_svx.mk
Diffstat (limited to 'RepositoryModule_ooo.mk')
| -rw-r--r-- | RepositoryModule_ooo.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 6389d155144c..dfe6ec52d3c4 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Module_Module,ooo)) $(eval $(call gb_Module_add_moduledirs,ooo,\ + accessibility \ animations \ basctl \ basebmp \ @@ -40,6 +41,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ comphelper \ configmgr \ cppcanvas \ + cppu \ cui \ dbaccess \ desktop \ @@ -73,6 +75,8 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ qadevOOo \ regexp \ reportdesign \ + sal \ + salhelper \ sane \ sax \ sc \ @@ -113,7 +117,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ # these have only migrated subsequentcheck for now $(eval $(call gb_Module_add_moduledirs,ooo,\ - sal \ ucb \ )) |