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 /Repository.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 'Repository.mk')
| -rw-r--r-- | Repository.mk | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/Repository.mk b/Repository.mk index cbc08893f0af..37b3af0055fa 100644 --- a/Repository.mk +++ b/Repository.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ bestreversemap \ bmp \ bmpsum \ + cppunit/cppunittester \ g2g \ gencoll_rule \ genconv_dict \ @@ -41,6 +42,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ saxparser \ so_checksum \ svidl \ + typesconfig \ xml2cmp \ )) @@ -116,6 +118,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ abp \ adabas \ adabasui \ + acc \ agg \ analysis \ animcore \ @@ -285,10 +288,12 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ endif $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ + sal_textenc \ xmlreader \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + affine_uno \ avmediagst \ avmediawin \ collator_data \ @@ -298,10 +303,12 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ dict_zh \ fileacc \ index_data \ + java_uno_accessbridge \ localedata_en \ localedata_es \ localedata_euro \ localedata_others \ + log_uno \ mcnttype \ neon \ npsoplugin \ @@ -317,10 +324,17 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ ucpfile \ unopkgapp \ updchk \ + unsafe_uno \ xmlsecurity \ xsec_fw \ xsec_xmlsec \ xstor \ + $(if $(filter $(OS),ANDROID), \ + lo-bootstrap \ + ) \ + $(if $(filter $(OS),WNT), \ + uwinapi \ + ) \ )) ifeq ($(OS),WNT) @@ -337,7 +351,6 @@ endif ifeq ($(OS),IOS) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ gcc3_uno \ - sal_textenc \ )) endif @@ -351,6 +364,7 @@ $(eval $(call gb_Helper_register_libraries,RTLIBS, \ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ cppuhelper \ + purpenvhelper \ salhelper \ )) |