diff options
| author | Andras Timar <atimar@suse.com> | 2012-10-13 17:41:05 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-10-13 17:41:05 +0200 |
| commit | e5ce011c3f32f53ef073aec5485450b2588b656a (patch) | |
| tree | 8a838a53bcdd70cc3d4cdbca0ebe07504790952e /Repository.mk | |
| parent | c6b26144c93aa5222e4260c5b0ef45ce5bdc18d2 (diff) | |
| parent | e74fc93e4aba7887e6a278cc44c4bc0962471065 (diff) | |
Merge branch 'master' into feature/killsdf
Conflicts:
Makefile.top
Module_tail_build.mk
RepositoryExternal.mk
RepositoryFixes.mk
accessibility/source/standard/vclxaccessibletoolbox.cxx
basic/source/uno/dlgcont.cxx
connectivity/Library_ado.mk
cross_tail_build/prj/build.lst
desktop/source/offacc/acceptor.cxx
filter/Library_PptImporter.mk
filter/source/t602/filterenv.cxx
i18npool/Library_textconv_dict.mk
ooo.lst.in
saxon/ExternalProject_saxon.mk
saxon/build.xml
sc/sdi/scalc.sdi
sc/source/filter/xml/xmlstyli.cxx
sc/source/ui/condformat/condformatdlg.cxx
sc/source/ui/condformat/condformatmgr.cxx
sc/source/ui/view/cellsh1.cxx
sdext/source/pdfimport/misc/pwdinteract.cxx
shell/qa/zip/makefile.mk
shell/qa/zip/testimpl/makefile.mk
solenv/gbuild/CppunitTest.mk
solenv/gbuild/gbuild.mk
solenv/gbuild/platform/android.mk
solenv/gbuild/platform/com_GCC_defs.mk
solenv/gbuild/platform/macosx.mk
soltools/Executable_adjustvisibility.mk
soltools/Executable_checkdll.mk
soltools/Executable_cpp.mk
soltools/Executable_javadep.mk
soltools/Executable_makedepend.mk
sw/qa/extras/rtfimport/rtfimport.cxx
tail_build/prj/build.lst
tomcat/ExternalProject_tomcat.mk
ucb/source/ucp/webdav/webdavcontent.cxx
xml2cmp/Executable_xml2cmp.mk
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Repository.mk b/Repository.mk index 8aa8e6c95c50..217d74a19278 100644 --- a/Repository.mk +++ b/Repository.mk @@ -76,7 +76,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \ uiex \ ulfconv \ ulfex \ - xml2cmp \ xpdfimport \ xrmex \ )) @@ -219,7 +218,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ endif $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ - PptImporter \ abp \ acc \ adabas \ @@ -469,6 +467,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ pyuno \ pyuno_wrapper \ recentfile \ + librsvg-2-2 \ scriptframe \ sdbc2 \ smoketest \ @@ -523,12 +522,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) endif -ifeq ($(OS),IOS) -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - gcc3_uno \ -)) -endif - $(eval $(call gb_Helper_register_libraries,RTLIBS, \ comphelper \ i18nisolang1 \ @@ -661,6 +654,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ codemaker_java \ cosv \ dtobj \ + findsofficepath \ headless \ libeay32 \ npsoenv \ |