Makefile.top | 2 +- RepositoryModule_ooo.mk | 31 ++++++++++++++++++++++--------- configure.in | 4 ++-- vcl/Library_vcl.mk | 6 ++++++ vcl/Library_vclplug_gen.mk | 6 ------ 5 files changed, 31 insertions(+), 18 deletions(-)
New commits: commit b42013ee093b7f91f91ec6ca9c3b3c08fe55b530 Author: David Tardon <[email protected]> Date: Fri Jun 1 10:15:17 2012 +0200 vcl uses X11/extension headers too Change-Id: Ie2ee19ca685d082f50415c2d916f5bfdf842bd84 diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index bf03be2..8d9473a 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -44,6 +44,12 @@ endif $(eval $(call gb_Library_use_package,vcl,vcl_inc)) +ifneq ($(filter X11_EXTENSIONS,$(BUILD_TYPE)),) +$(eval $(call gb_Library_use_packages,vclplug_gen,\ + x11_extensions_inc \ +)) +endif + $(eval $(call gb_Library_use_custom_headers,vcl,vcl/generic/fontmanager)) $(eval $(call gb_Library_set_include,vcl,\ diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 50c0c64..3ff257a 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -28,12 +28,6 @@ $(eval $(call gb_Library_Library,vclplug_gen)) -ifneq ($(filter X11_EXTENSIONS,$(BUILD_TYPE)),) -$(eval $(call gb_Library_use_packages,vclplug_gen,\ - x11_extensions_inc \ -)) -endif - $(eval $(call gb_Library_set_include,vclplug_gen,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ commit 1f33addebbc66f78dd64e382b1dd9bd0dd82cac2 Author: David Tardon <[email protected]> Date: Fri Jun 1 10:10:34 2012 +0200 move test for system headers to the right branch Change-Id: If162227d55f244ee85d1b0725829a9533427d12c diff --git a/configure.in b/configure.in index 21f606b..293f1c5 100644 --- a/configure.in +++ b/configure.in @@ -8065,10 +8065,10 @@ fi AC_MSG_CHECKING([whether to use internal X11 extensions headers]) if test "$with_system_xextensions_headers" != "no"; then AC_MSG_RESULT([no]) -else - AC_MSG_RESULT([yes]) AC_CHECK_HEADERS(X11/extensions/shape.h,[],[AC_MSG_ERROR([libXext headers not found])], [#include <X11/extensions/shape.h>]) +else + AC_MSG_RESULT([yes]) BUILD_TYPE="$BUILD_TYPE X11_EXTENSIONS" fi commit 46d08bde567f8b90ad2e2a087ff7404b41678997 Author: David Tardon <[email protected]> Date: Fri Jun 1 08:00:59 2012 +0200 remotebridges is converted too Change-Id: Iec0feb10d3de2f4c740fb857cb9fa145437740f2 diff --git a/Makefile.top b/Makefile.top index 192ddbd..448f281 100644 --- a/Makefile.top +++ b/Makefile.top @@ -94,6 +94,7 @@ psprint_config\ qadevOOo\ regexp\ registry\ +remotebridges\ reportbuilder\ reportdesign\ rdbmaker\ @@ -228,7 +229,6 @@ python\ pyuno\ readlicense_oo\ redland\ -remotebridges\ rhino\ saxon\ setup_native\ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index faa8999..83f97da 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -98,6 +98,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ ) \ rdbmaker \ regexp \ + remotebridges \ reportbuilder \ reportdesign \ ridljar \ commit 5b8e012718190e6dbfc6208a0d533e3276141aa9 Author: David Tardon <[email protected]> Date: Fri Jun 1 08:00:14 2012 +0200 keep the list in alphabetical order Change-Id: Ie1bcbe4fb1a67649b99b8f94625b74e51bb64306 diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 6ccb240..faa8999 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -73,9 +73,9 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ idlc \ io \ javaunohelper \ + jurt \ jvmaccess \ jvmfwk \ - jurt \ l10ntools \ lingucomponent \ linguistic \ @@ -93,6 +93,9 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ packimages \ padmin \ psprint_config \ + $(if $(strip $(OOO_JUNIT_JAR)),\ + qadevOOo \ + ) \ rdbmaker \ regexp \ reportbuilder \ @@ -162,12 +165,4 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ xmlsecurity \ )) -ifneq ($(SOLAR_JAVA),) - ifneq "$(OOO_JUNIT_JAR)" "" -$(eval $(call gb_Module_add_moduledirs,ooo,\ - qadevOOo \ -)) - endif -endif - # vim: set noet ts=4 sw=4: commit 8ee4f89f612ee6a7133590049de823df02818c6a Author: David Tardon <[email protected]> Date: Fri Jun 1 07:59:21 2012 +0200 add missing modules Change-Id: I1ae167e5e6bcdc9ced4bf6808ae6b8a9237b4710 diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 7efe7c3..6ccb240 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ cppcanvas \ cppu \ cppuhelper \ + cpputools \ cui \ dbaccess \ desktop \ @@ -70,10 +71,12 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ i18nutil \ idl \ idlc \ + io \ javaunohelper \ jvmaccess \ jvmfwk \ jurt \ + l10ntools \ lingucomponent \ linguistic \ lotuswordpro \ @@ -87,6 +90,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ oovbaapi \ oox \ package \ + packimages \ padmin \ psprint_config \ rdbmaker \ @@ -102,23 +106,31 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ sc \ scaddins \ sccomp \ + scp2 \ scripting \ sd \ sdext \ sfx2 \ + shell \ slideshow \ smoketest \ + solenv \ sot \ starmath \ stoc \ + store svl \ svtools \ svx \ sw \ swext \ test \ + testtools \ toolkit \ tools \ + $(if $(filter TRANSLATIONS,$(BUILD_TYPE)),\ + translations \ + ) \ twain \ ucb \ ucbhelper \ @@ -137,12 +149,17 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ wizards \ writerfilter \ writerperfect \ + $(if $(filter X11_EXTENSIONS,$(BUILD_TYPE)),\ + x11_extensions \ + ) \ xmerge \ xmlsecurity \ xml2cmp \ + xmlhelp \ xmloff \ xmlreader \ xmlscript \ + xmlsecurity \ )) ifneq ($(SOLAR_JAVA),) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
