Makefile.top | 1 + Module_cross_tail_build.mk | 4 +++- Module_tail_build.mk | 15 +++++++++++---- bluez_bluetooth/prj/build.lst | 2 ++ clucene/Library_clucene.mk | 2 +- solenv/gbuild/ExtensionTarget.mk | 10 ++++++++-- 6 files changed, 26 insertions(+), 8 deletions(-)
New commits: commit 4295bd60d8e57d6c2cad5092a90735eaafb929f0 Author: David Tardon <[email protected]> Date: Sun Sep 23 19:30:14 2012 +0200 allow make bluez_bluetooth.all Change-Id: Ic1d2d52fda7fb4cfbb4e6e6a83d5fe7149f8e003 diff --git a/Makefile.top b/Makefile.top index 429dc2e..990aabb 100644 --- a/Makefile.top +++ b/Makefile.top @@ -43,6 +43,7 @@ basegfx\ basic\ bean\ binaryurp\ +bluez_bluetooth\ boost\ bridges\ canvas\ diff --git a/bluez_bluetooth/prj/build.lst b/bluez_bluetooth/prj/build.lst new file mode 100644 index 0000000..b545f1b --- /dev/null +++ b/bluez_bluetooth/prj/build.lst @@ -0,0 +1,2 @@ +bz bluez_bluetooth : NULL +bz bluez_bluetooth\prj nmake - all bz_prj NULL diff --git a/bluez_bluetooth/prj/d.lst b/bluez_bluetooth/prj/d.lst new file mode 100644 index 0000000..e69de29 commit 5bf0ae57502bda9bc71b2a075667dea673e51257 Author: David Tardon <[email protected]> Date: Sun Sep 23 18:50:36 2012 +0200 keep the lists alphabetically sorted Change-Id: I82734285736dd9ee5236f522892bd80a80f520fc diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk index 2df5cb5..61b5145 100644 --- a/Module_cross_tail_build.mk +++ b/Module_cross_tail_build.mk @@ -43,6 +43,9 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ cosv \ cppu \ cppuhelper \ + $(if $(filter DESKTOP,$(BUILD_TYPE)),\ + helpcompiler \ + ) \ i18npool \ i18nutil \ idl \ @@ -54,7 +57,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ jvmfwk \ $(if $(filter DESKTOP,$(BUILD_TYPE)),\ l10ntools \ - helpcompiler \ ) \ o3tl \ offapi \ diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 693455e..aed96a2 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -43,12 +43,12 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ canvas \ chart2 \ cli_ure \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),\ - codemaker \ - ) \ $(if $(filter CLUCENE,$(BUILD_TYPE)),\ clucene \ ) \ + $(if $(filter DESKTOP,$(BUILD_TYPE)),\ + codemaker \ + ) \ comphelper \ configmgr \ connectivity \ @@ -77,6 +77,9 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ formula \ fpicker \ framework \ + $(if $(filter DESKTOP,$(BUILD_TYPE)), \ + helpcompiler \ + ) \ $(if $(filter HSQLDB,$(BUILD_TYPE)),\ hsqldb \ ) \ @@ -201,8 +204,8 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ ) \ xmerge \ $(if $(filter DESKTOP,$(BUILD_TYPE)), \ - helpcompiler \ - xmlhelp) \ + xmlhelp \ + ) \ xmloff \ xmlreader \ xmlscript \ commit 0c6aa2881d18c81ff711b5ce8f0e550eacaa11d6 Author: David Tardon <[email protected]> Date: Sun Sep 23 18:34:55 2012 +0200 do not build what is not necessary Change-Id: I6fb9ff64c2cc408bf4133ddcee4a255b54078e41 diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 13efa58..693455e 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -46,7 +46,9 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ $(if $(filter DESKTOP,$(BUILD_TYPE)),\ codemaker \ ) \ - clucene \ + $(if $(filter CLUCENE,$(BUILD_TYPE)),\ + clucene \ + ) \ comphelper \ configmgr \ connectivity \ @@ -101,7 +103,9 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ lingucomponent \ linguistic \ lotuswordpro \ - l10ntools \ + $(if $(filter DESKTOP,$(BUILD_TYPE)),\ + l10ntools \ + ) \ MathMLDTD \ mdds \ Mesa \ commit 47a5ea6437853ab16a757f2181eacc3a07d3d90c Author: David Tardon <[email protected]> Date: Sun Sep 23 18:26:41 2012 +0200 fix typo Change-Id: I6fc329c2faacac943bf2c1beb234a6cc6d5aaf03 diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index 2f9edf1..75b9e0c 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -328,7 +328,7 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \ $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(2)/$(dir $(or $(4),$(3)))))localize.sdf endif $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \ - $(if $(filter-out en-US,$(WITH_LANG)),$(gb_ExtensionTarget_UPDATETREETARGET)) | \ + $(if $(filter-out en-US,$(5)),$(gb_ExtensionTarget_UPDATETREETARGET)) | \ $(2)/$(4) $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \ $(2)/$(or $(4),$(3)) commit 9a0e0141e607bf59f363826a8c7f52b008de5586 Author: David Tardon <[email protected]> Date: Sun Sep 23 18:26:20 2012 +0200 do not add deps on SDFs if not building with langs Change-Id: I48fa21356ba32670b137bd3846f00b522af5314b diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index 7c5d3d3..2f9edf1 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -286,10 +286,12 @@ define gb_ExtensionTarget__localize_helpfile_onelang $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done : HELPFILES += $(3) $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done : \ $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) +ifneq ($(strip $(gb_WITH_LANG)),) $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \ SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(2)/$(dir $(or $(4),$(3)))))localize.sdf $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \ $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(2)/$(dir $(or $(4),$(3)))))localize.sdf +endif $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \ $(if $(filter-out en-US,$(5)),$(gb_ExtensionTarget_HELPEXTARGET)) | \ $(call gb_ExtensionTarget_get_workdir,$(1))/help/.dir @@ -319,10 +321,12 @@ endef define gb_ExtensionTarget__localize_helptreefile_onelang $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done : \ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) +ifneq ($(strip $(gb_WITH_LANG)),) $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \ SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(2)/$(dir $(or $(4),$(3)))))localize.sdf $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \ $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(2)/$(dir $(or $(4),$(3)))))localize.sdf +endif $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \ $(if $(filter-out en-US,$(WITH_LANG)),$(gb_ExtensionTarget_UPDATETREETARGET)) | \ $(2)/$(4) @@ -331,7 +335,9 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \ $$(call gb_Output_announce,$(1) $(3) $(5),$(true),TRE,3) $$(call gb_Helper_abbreviate_dirs, \ mkdir -p $$(dir $$@) && \ - $(gb_ExtensionTarget_UPDATETREECOMMAND) $$< $(5) $$(SDF) $$@ $(6) ) + $(if $(filter-out en-US,$(5)), \ + $(gb_ExtensionTarget_UPDATETREECOMMAND) $$< $(5) $$(SDF) $$@ $(6),\ + cp $$< $$@)) endef commit 22371e3aa8707803543592e81edecff6db8aac7f Author: David Tardon <[email protected]> Date: Sun Sep 23 18:06:49 2012 +0200 fix dep on clucene headers Change-Id: I1a644dabdd5404645450541ab6a7a94aaf61658d diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk index d8874c4..39ef5ca 100644 --- a/clucene/Library_clucene.mk +++ b/clucene/Library_clucene.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,clucene)) $(eval $(call gb_Library_use_external,clucene,zlib)) -$(eval $(call gb_Library_use_package,clucene,clucene_source)) +$(eval $(call gb_Library_use_package,clucene,clucene_inc)) $(eval $(call gb_Library_use_unpacked,clucene,clucene)) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
