diff options
| author | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
| commit | 06ec1c089519ef3249464aa09eadf03a8db93a39 (patch) | |
| tree | 85b2eb6d8ba6ca95e18e1ff82151224cb14106f6 /Repository.mk | |
| parent | 8e0d67bed54633d555a4601a5d79e2d5ba7ab2bb (diff) | |
| parent | 3f899eae02eaad0b967de749fe09b869ba93ad6d (diff) | |
Merge branch 'master' into feature/killsdf
Conflicts:
Repository.mk
RepositoryFixes.mk
connectivity/prj/build.lst
extensions/prj/build.lst
filter/prj/build.lst
fpicker/prj/build.lst
l10ntools/StaticLibrary_transex.mk
saxon/build.xml
shell/prj/build.lst
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/Configuration.mk
solenv/gbuild/UI.mk
ucb/source/ucp/webdav/webdavcontent.cxx
Diffstat (limited to 'Repository.mk')
| -rwxr-xr-x[-rw-r--r--] | Repository.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Repository.mk b/Repository.mk index 5b24259e59c1..cc41b0631363 100644..100755 --- a/Repository.mk +++ b/Repository.mk @@ -57,10 +57,9 @@ $(eval $(call gb_Helper_register_executables,NONE, \ pdf2xml \ pdfunzip \ propex \ - rdbmaker \ regsingleton \ regsvrex \ - renewpo \ + renewpo \ rsc \ rscdep \ saxparser \ @@ -353,6 +352,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ spl \ sts \ svgfilter \ + svgio \ svl \ svt \ svx \ @@ -412,7 +412,7 @@ endif $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ affine_uno \ - cli_cppuhelper_native \ + cli_cppuhelper \ cli_uno \ gcc3_uno \ java_uno \ @@ -468,7 +468,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ pyuno \ pyuno_wrapper \ recentfile \ - librsvg-2-2 \ scriptframe \ sdbc2 \ smoketest \ @@ -562,6 +561,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ ldapbe2 \ localebe1 \ lomenubar \ + losessioninstall \ macbe1 \ migrationoo2 \ migrationoo3 \ @@ -589,8 +589,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ vbaobj \ vbaswobj \ vclcanvas \ - writerfilter_uno \ - writerfilter_debug \ $(if $(filter $(GUIBASE),aqua), \ fps_aqua \ ) \ @@ -738,7 +736,6 @@ $(eval $(call gb_Helper_register_jars,OOO, \ fax \ form \ htmlsoff \ - java_accessibility \ java_uno_accessbridge \ letter \ officebean \ |