[Libreoffice-commits] .: 2 commits - automation/packimages automation/source desktop/win32 filter/source i18npool/source solenv/gbuild writerfilter/source
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Tue Nov 29 09:12:03 PST 2011
automation/packimages/Makefile | 1 +
automation/source/testtool/Makefile | 2 ++
desktop/win32/source/setup/Makefile | 1 +
filter/source/svg/Makefile | 1 +
i18npool/source/breakiterator/Makefile | 1 +
i18npool/source/indexentry/Makefile | 1 +
i18npool/source/localedata/Makefile | 1 +
i18npool/source/textconversion/Makefile | 1 +
solenv/gbuild/UnoApiTarget.mk | 6 +++---
writerfilter/source/Makefile | 2 ++
10 files changed, 14 insertions(+), 3 deletions(-)
New commits:
commit dd750cf42b308cdbf48ebd54fdd6f4fa0865b91a
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Nov 29 18:10:55 2011 +0100
with announce letters shalt thou count to three, no more, no less
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 5511ec5..e5415df 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -158,13 +158,13 @@ endef
.PHONY : $(call gb_UnoApiOutTarget_get_clean_target,%)
$(call gb_UnoApiOutTarget_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),UNOAPI,1)
+ $(call gb_Output_announce,$*,$(false),UNO,1)
-$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_UnoApiOutTarget_get_target,$*))
.PHONY : $(call gb_UnoApiTarget_get_clean_target,%)
$(call gb_UnoApiTarget_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),UNOAPI,1)
+ $(call gb_Output_announce,$*,$(false),UNO,1)
-$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_UnoApiTarget_get_target,$*))
-rm -rf $(call gb_UnoApiTarget_get_header_target,$*)\
@@ -213,7 +213,7 @@ $(call gb_UnoApiTarget_get_target,%):
$(if $(gb_UnoApiTarget_IDLFILES_$*),$(call gb_UnoApiTarget__command,$@,$*,$<,UCR,$(addprefix $(call gb_UnoApiPartTarget_get_target,),$(patsubst %.idl,%.urd,$(gb_UnoApiTarget_IDLFILES_$*)))))
$(if $(UNOAPI_MERGE),$(call gb_UnoApiTarget__command,$@,$*,$<,/,$(UNOAPI_MERGE)))
$(if $(UNOAPI_REFERENCE), \
- $(call gb_Output_announce,$*,$(true),RDBCHEK,4) \
+ $(call gb_Output_announce,$*,$(true),DBc,4) \
$(gb_UnoApiTarget_REGCOMPARECOMMAND) -f -t -r1 $(call gb_Helper_convert_native,$(UNOAPI_REFERENCE)) -r2 $(call gb_Helper_convert_native,$@))
$(if $(gb_UnoApiTarget_IDLFILES_$*), \
$(call gb_Output_announce,$*,$(true),HPP,4) \
commit b1d20f68474d91d8accafdeb403526b16a636220
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Nov 29 18:04:42 2011 +0100
set gb_PARTIALBUILD in CustomTargets
diff --git a/automation/packimages/Makefile b/automation/packimages/Makefile
index 69631bb..a26f117 100644
--- a/automation/packimages/Makefile
+++ b/automation/packimages/Makefile
@@ -23,6 +23,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
+gb_PARTIALBUILD:=T
include $(GBUILDDIR)/gbuild_simple.mk
BINDIR := $(dir $(GBUILDDIR))bin
diff --git a/automation/source/testtool/Makefile b/automation/source/testtool/Makefile
index f0d1d13..9b1e007 100644
--- a/automation/source/testtool/Makefile
+++ b/automation/source/testtool/Makefile
@@ -23,6 +23,8 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
+
+gb_PARTIALBUILD:=T
include $(GBUILDDIR)/gbuild_simple.mk
BASEDIR := $(dir $(firstword $(MAKEFILE_LIST)))
diff --git a/desktop/win32/source/setup/Makefile b/desktop/win32/source/setup/Makefile
index c5337ee..004f490 100644
--- a/desktop/win32/source/setup/Makefile
+++ b/desktop/win32/source/setup/Makefile
@@ -23,6 +23,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
+gb_PARTIALBUILD:=T
include $(GBUILDDIR)/gbuild_simple.mk
DESTDIR := $(WORKDIR)/CustomTarget/desktop/win32/source/setup
diff --git a/filter/source/svg/Makefile b/filter/source/svg/Makefile
index 20ed8f8..31a4244 100644
--- a/filter/source/svg/Makefile
+++ b/filter/source/svg/Makefile
@@ -28,6 +28,7 @@
SRCDIR_FILTER := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
WORKDIR_FILTER := .
+gb_PARTIALBUILD:=T
include $(GBUILDDIR)/gbuild.mk
filter_SRC_svg_Tokens := $(SRCDIR_FILTER)/tokens.txt
diff --git a/i18npool/source/breakiterator/Makefile b/i18npool/source/breakiterator/Makefile
index 011dd6f..9f1a6ce 100644
--- a/i18npool/source/breakiterator/Makefile
+++ b/i18npool/source/breakiterator/Makefile
@@ -28,6 +28,7 @@
all : OpenOffice_dat.c data/dict_ja.cxx data/dict_zh.cxx
+gb_PARTIALBUILD:=T
include $(GBUILDDIR)/gbuild_simple.mk
data:
diff --git a/i18npool/source/indexentry/Makefile b/i18npool/source/indexentry/Makefile
index c5335dc..cb0212c 100644
--- a/i18npool/source/indexentry/Makefile
+++ b/i18npool/source/indexentry/Makefile
@@ -28,6 +28,7 @@
all : $(subst .txt,.cxx,$(notdir $(wildcard $(SRC_ROOT)/i18npool/source/indexentry/data/*.txt)))
+gb_PARTIALBUILD:=T
include $(GBUILDDIR)/gbuild_simple.mk
%.cxx : %_invis.cxx
diff --git a/i18npool/source/localedata/Makefile b/i18npool/source/localedata/Makefile
index 6c3774e..336eb67 100755
--- a/i18npool/source/localedata/Makefile
+++ b/i18npool/source/localedata/Makefile
@@ -28,6 +28,7 @@
all : $(patsubst %.xml,localedata_%.cxx,$(notdir $(wildcard $(SRC_ROOT)/i18npool/source/localedata/data/*.xml)))
+gb_PARTIALBUILD:=T
include $(GBUILDDIR)/gbuild_simple.mk
my_file := file://$(if $(filter $(OS_FOR_BUILD),WNT),/)
diff --git a/i18npool/source/textconversion/Makefile b/i18npool/source/textconversion/Makefile
index 8a4693d..97e0e2d 100755
--- a/i18npool/source/textconversion/Makefile
+++ b/i18npool/source/textconversion/Makefile
@@ -28,6 +28,7 @@
all : $(subst .dic,.cxx,$(notdir $(wildcard $(SRC_ROOT)/i18npool/source/textconversion/data/*.dic)))
+gb_PARTIALBUILD:=T
include $(GBUILDDIR)/gbuild_simple.mk
%.cxx : %_invis.cxx
diff --git a/writerfilter/source/Makefile b/writerfilter/source/Makefile
index 61a58db..40f2e25 100644
--- a/writerfilter/source/Makefile
+++ b/writerfilter/source/Makefile
@@ -27,6 +27,8 @@
WFDIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+gb_PARTIALBUILD:=T
include $(WFDIR)generated.mk
include $(GBUILDDIR)/gbuild_simple.mk
More information about the Libreoffice-commits
mailing list