diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:04 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:04 +0200 |
| commit | ca907e02205e8e99e28608ddfe7bdaca24f23aa4 (patch) | |
| tree | afdf8fb6a8aef6920ad0f658bdad85c419e0c43e /Repository.mk | |
| parent | 817da75b0809642d68b3cab35a1a9348139e9321 (diff) | |
| parent | 35c884841001c6367d428db8e4407afc4d5077ca (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
Makefile.in
Repository.mk
autogen.sh
bin/lo-commit-stat
configure.in
distro-configs/LibreOfficeOpenBSD.conf
distro-configs/LibreOfficeWin32.conf
instsetoo_native/util/openoffice.lst
ooo.lst.in
scp2/source/ooo/module_langpack.ulf
set_soenv.in
solenv/bin/ooinstall
solenv/gbuild/CppunitTest.mk
solenv/gbuild/Library.mk
solenv/gbuild/LinkTarget.mk
solenv/gbuild/TargetLocations.mk
solenv/gbuild/platform/macosx.mk
solenv/gbuild/platform/solaris.mk
solenv/gbuild/platform/unxgcc.mk
solenv/gbuild/platform/windows.mk
solenv/inc/minor.mk
solenv/inc/settings.mk
tail_build/prj/makefile.mk
Diffstat (limited to 'Repository.mk')
| -rwxr-xr-x[-rw-r--r--] | Repository.mk | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Repository.mk b/Repository.mk index 3609e71f90a7..0afca0dca6ae 100644..100755 --- a/Repository.mk +++ b/Repository.mk @@ -43,8 +43,10 @@ $(eval $(call gb_Helper_register_executables,OOO, \ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ adabasui \ + AppleRemote \ avmedia \ basegfx \ + basebmp \ canvastools \ chartcontroller \ chartmodel \ @@ -57,6 +59,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ dbmm \ dbtools \ dbu \ + desktop_detector \ doctok \ drawinglayer \ editeng \ @@ -111,6 +114,11 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ utl \ vbahelper \ vcl \ + vclplug_gen \ + vclplug_gtk \ + vclplug_kde \ + vclplug_kde4 \ + vclplug_svp \ writerfilter \ xcr \ xo \ @@ -129,6 +137,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ icui18n \ icule \ icuuc \ + icule \ + graphite_dll \ + cppunit \ rdf \ ssl \ xslt \ @@ -139,6 +150,7 @@ $(eval $(call gb_Helper_register_libraries,RTLIBS, \ comphelper \ i18nisolang1 \ i18nutil \ + jvmaccess \ ucbhelper \ )) @@ -170,6 +182,7 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ crypto \ + graphite2_off \ libeay32 \ ssleay32 \ jpeglib \ |