[Libreoffice-commits] core.git: 2 commits - basctl/Module_basctl.mk chart2/Module_chart2.mk cui/Module_cui.mk dbaccess/Module_dbaccess.mk desktop/Module_desktop.mk extensions/Module_extensions.mk filter/Module_filter.mk framework/Module_framework.mk padmin/Module_padmin.mk postprocess/Module_postprocess.mk reportdesign/Module_reportdesign.mk sc/Module_sc.mk sd/Module_sd.mk sfx2/Module_sfx2.mk solenv/gbuild starmath/Module_starmath.mk svtools/Module_svtools.mk svx/Module_svx.mk sw/Module_sw.mk uui/Module_uui.mk vcl/Module_vcl.mk xmlsecurity/Module_xmlsecurity.mk

Mon, 16 Dec 2013 08:37:52 -0800 

 basctl/Module_basctl.mk             |    2 +-
 chart2/Module_chart2.mk             |    2 +-
 cui/Module_cui.mk                   |    2 +-
 dbaccess/Module_dbaccess.mk         |   14 +++++++-------
 desktop/Module_desktop.mk           |    2 +-
 extensions/Module_extensions.mk     |    4 ++--
 filter/Module_filter.mk             |    2 +-
 framework/Module_framework.mk       |    2 +-
 padmin/Module_padmin.mk             |    2 +-
 postprocess/Module_postprocess.mk   |    4 +++-
 reportdesign/Module_reportdesign.mk |    2 +-
 sc/Module_sc.mk                     |    2 +-
 sd/Module_sd.mk                     |    4 ++--
 sfx2/Module_sfx2.mk                 |    2 +-
 solenv/gbuild/Module.mk             |    4 ++--
 starmath/Module_starmath.mk         |    2 +-
 svtools/Module_svtools.mk           |    2 +-
 svx/Module_svx.mk                   |    2 +-
 sw/Module_sw.mk                     |    8 ++++----
 uui/Module_uui.mk                   |    2 +-
 vcl/Module_vcl.mk                   |    2 +-
 xmlsecurity/Module_xmlsecurity.mk   |    2 +-
 22 files changed, 36 insertions(+), 34 deletions(-)

New commits:
commit e125dee18a6dcaf9a7f07c7e26fc44d111f2a7d5
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date:   Mon Dec 16 16:52:29 2013 +0100

    postprocess registry is a l10n-relevant target
    
    Change-Id: I349fb24a388775c58be7a326832b3fc0ec38180f

diff --git a/postprocess/Module_postprocess.mk 
b/postprocess/Module_postprocess.mk
index 9ed1a75..d3d5a95 100644
--- a/postprocess/Module_postprocess.mk
+++ b/postprocess/Module_postprocess.mk
@@ -16,9 +16,11 @@ $(eval $(call gb_Module_add_targets,postprocess,\
        CustomTarget_images \
        CustomTarget_registry \
        Package_images \
-       Package_registry \
        Rdb_services \
 ))
+$(eval $(call gb_Module_add_l10n_targets,postprocess,\
+       Package_registry \
+))
 
 ifeq ($(WINDOWS_BUILD_SIGNING),TRUE)
 $(eval $(call gb_Module_add_targets,postprocess,\
commit 78c7eb35076ed9d6749730f299cb8e87a2033753
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date:   Mon Dec 16 16:51:35 2013 +0100

    uiconfig is a l10n-relevant target
    
    Change-Id: I8a2ca73c02fd6b04ce60e7701c51d2362ef7ec06

diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk
index 5da59c9..92d3553 100644
--- a/basctl/Module_basctl.mk
+++ b/basctl/Module_basctl.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Module_add_l10n_targets,basctl,\
 
 endif
 
-$(eval $(call gb_Module_add_targets,basctl,\
+$(eval $(call gb_Module_add_l10n_targets,basctl,\
        UIConfig_basicide \
 ))
 
diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
index 49a8c51..a7751e9 100644
--- a/chart2/Module_chart2.mk
+++ b/chart2/Module_chart2.mk
@@ -12,11 +12,11 @@ $(eval $(call gb_Module_Module,chart2))
 $(eval $(call gb_Module_add_targets,chart2,\
     Library_chartcontroller \
     Library_chartcore \
-       UIConfig_chart2 \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,chart2,\
     AllLangResTarget_chartcontroller \
+       UIConfig_chart2 \
 ))
 
 $(eval $(call gb_Module_add_slowcheck_targets,chart2,\
diff --git a/cui/Module_cui.mk b/cui/Module_cui.mk
index 62398b3..2a2fca4 100644
--- a/cui/Module_cui.mk
+++ b/cui/Module_cui.mk
@@ -11,11 +11,11 @@ $(eval $(call gb_Module_Module,cui))
 
 $(eval $(call gb_Module_add_targets,cui,\
        Library_cui \
-       UIConfig_cui \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,cui,\
        AllLangResTarget_cui \
+       UIConfig_cui \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 5c05968..b9d7d56 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -18,13 +18,6 @@ $(eval $(call gb_Module_add_targets,dbaccess,\
        Library_dbmm \
        Library_dbu \
        Library_sdbt \
-       UIConfig_dbaccess \
-       UIConfig_dbapp \
-       UIConfig_dbbrowser \
-       UIConfig_dbquery \
-       UIConfig_dbrelation \
-       UIConfig_dbtable \
-       UIConfig_dbtdata \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,dbaccess,\
@@ -32,6 +25,13 @@ $(eval $(call gb_Module_add_l10n_targets,dbaccess,\
     AllLangResTarget_dbmm \
     AllLangResTarget_dbu \
     AllLangResTarget_sdbt \
+       UIConfig_dbaccess \
+       UIConfig_dbapp \
+       UIConfig_dbbrowser \
+       UIConfig_dbquery \
+       UIConfig_dbrelation \
+       UIConfig_dbtable \
+       UIConfig_dbtdata \
 ))
 
 ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index b54bc96..c325176 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -20,13 +20,13 @@ $(eval $(call gb_Module_add_targets,desktop,\
     $(if $(ENABLE_HEADLESS),,Library_spl) \
     Package_branding \
     $(if $(CUSTOM_BRAND_DIR),Package_branding_custom) \
-    UIConfig_deployment \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,desktop,\
     AllLangResTarget_deployment \
     AllLangResTarget_deploymentgui \
     AllLangResTarget_dkt \
+    UIConfig_deployment \
 ))
 
 ifeq ($(OS),LINUX)
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 4f30191..4761bba 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -34,13 +34,13 @@ $(eval $(call gb_Module_add_targets,extensions,\
        Library_bib \
        Library_dbp \
        Library_pcr \
-       UIConfig_sbibliography \
-       UIConfig_spropctrlr \
 ))
 $(eval $(call gb_Module_add_l10n_targets,extensions,\
        AllLangResTarget_bib \
        AllLangResTarget_dbp \
        AllLangResTarget_pcr \
+       UIConfig_sbibliography \
+       UIConfig_spropctrlr \
 ))
 endif
 
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index acff4f8..403184a 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -61,7 +61,6 @@ $(eval $(call gb_Module_add_targets,filter,\
        Package_docbook \
        Package_xhtml \
        Package_xslt \
-       UIConfig_xsltdlg \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,filter,\
@@ -69,6 +68,7 @@ $(eval $(call gb_Module_add_l10n_targets,filter,\
        AllLangResTarget_pdffilter \
        AllLangResTarget_t602filter \
        AllLangResTarget_xsltdlg \
+       UIConfig_xsltdlg \
 ))
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
diff --git a/framework/Module_framework.mk b/framework/Module_framework.mk
index b597d34..2e6d5b7 100644
--- a/framework/Module_framework.mk
+++ b/framework/Module_framework.mk
@@ -26,11 +26,11 @@ $(eval $(call gb_Module_add_targets,framework,\
     Library_fwl \
     Library_fwm \
     Package_dtd \
-    UIConfig_startmodule \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,framework,\
     AllLangResTarget_fwe \
+    UIConfig_startmodule \
 ))
 
 ifneq ($(OOO_JUNIT_JAR),)
diff --git a/padmin/Module_padmin.mk b/padmin/Module_padmin.mk
index 12f3f4c..45db7aa 100644
--- a/padmin/Module_padmin.mk
+++ b/padmin/Module_padmin.mk
@@ -26,11 +26,11 @@ $(eval $(call gb_Module_add_targets,padmin,\
     Executable_spadmin.bin \
     Library_spa \
     Package_padmin \
-    UIConfig_spa \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,padmin,\
     AllLangResTarget_spa \
+    UIConfig_spa \
 ))
 
 endif
diff --git a/reportdesign/Module_reportdesign.mk 
b/reportdesign/Module_reportdesign.mk
index 620fbbf..bba86b9 100644
--- a/reportdesign/Module_reportdesign.mk
+++ b/reportdesign/Module_reportdesign.mk
@@ -13,12 +13,12 @@ $(eval $(call gb_Module_add_targets,reportdesign,\
     Library_rpt \
     Library_rptui \
     Library_rptxml \
-    UIConfig_dbreport \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,reportdesign,\
     AllLangResTarget_rpt \
     AllLangResTarget_rptui \
+    UIConfig_dbreport \
 ))
 
 # deactivated since sb123;
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index cc974a0..6730163 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -15,11 +15,11 @@ $(eval $(call gb_Module_add_targets,sc,\
        Library_scd \
        Library_scfilt \
        Library_scui \
-       UIConfig_scalc \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,sc,\
        AllLangResTarget_sc \
+       UIConfig_scalc \
 ))
 
 ifneq (,$(ENABLE_OPENCL))
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 16e7772..3321279 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -17,12 +17,12 @@ $(eval $(call gb_Module_add_targets,sd,\
     Package_opengl \
     Package_web \
     Package_xml \
-    UIConfig_sdraw \
-    UIConfig_simpress \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,sd,\
     AllLangResTarget_sd \
+    UIConfig_sdraw \
+    UIConfig_simpress \
 ))
 
 ifneq ($(OS),DRAGONFLY)
diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk
index 1164ca4..be82c7c 100644
--- a/sfx2/Module_sfx2.mk
+++ b/sfx2/Module_sfx2.mk
@@ -21,11 +21,11 @@ $(eval $(call gb_Module_Module,sfx2))
 
 $(eval $(call gb_Module_add_targets,sfx2,\
     Library_sfx \
-    UIConfig_sfx \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,sfx2,\
     AllLangResTarget_sfx2 \
+    UIConfig_sfx \
 ))
 
 $(eval $(call gb_Module_add_check_targets,sfx2,\
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index a5822ae..1440f67 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -227,7 +227,7 @@ endif
 endef
 
 define gb_Module_add_target
-$(if $(filter AllLang% Dictionary%,$(2)),$(warning target $(2) should be a 
l10n target))
+$(if $(filter AllLang% Dictionary% UIConfig%,$(2)),$(warning target $(2) 
should be a l10n target))
 $(call gb_Module__read_targetfile,$(1),$(2),target)
 
 $(call gb_Module_get_nonl10n_target,$(1)) : $$(gb_Module_CURRENTTARGET)
@@ -236,7 +236,7 @@ $(call gb_Module_get_clean_target,$(1)) : 
$$(gb_Module_CURRENTCLEANTARGET)
 endef
 
 define gb_Module_add_l10n_target
-$(if $(filter AllLang% Dictionary%,$(2)),,$(warning target $(2) should not be 
a l10n target))
+$(if $(filter AllLang% Dictionary% UIConfig%,$(2)),,$(warning target $(2) 
should not be a l10n target))
 $(call gb_Module__read_targetfile,$(1),$(2),target)
 
 $(call gb_Module_get_l10n_target,$(1)) : $$(gb_Module_CURRENTTARGET)
diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk
index bd434dd..2830a46 100644
--- a/starmath/Module_starmath.mk
+++ b/starmath/Module_starmath.mk
@@ -13,11 +13,11 @@ $(eval $(call gb_Module_Module,starmath))
 $(eval $(call gb_Module_add_targets,starmath,\
     Library_sm \
     Library_smd \
-    UIConfig_smath \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,starmath,\
     AllLangResTarget_sm \
+    UIConfig_smath \
 ))
 
 $(eval $(call gb_Module_add_check_targets,starmath,\
diff --git a/svtools/Module_svtools.mk b/svtools/Module_svtools.mk
index edef7d5..485a575 100644
--- a/svtools/Module_svtools.mk
+++ b/svtools/Module_svtools.mk
@@ -21,11 +21,11 @@ $(eval $(call gb_Module_Module,svtools))
 
 $(eval $(call gb_Module_add_targets,svtools,\
     Library_svt \
-    UIConfig_svt \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,svtools,\
     AllLangResTarget_svt \
+    UIConfig_svt \
 ))
 
 ifneq ($(CROSS_COMPILING),YES)
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index 071e36f..80f2bd7 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_Module_add_targets,svx,\
     Library_svx \
     Library_svxcore \
     Library_textconversiondlgs \
-    UIConfig_svx \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,svx,\
@@ -31,6 +30,7 @@ $(eval $(call gb_Module_add_l10n_targets,svx,\
     AllLangResTarget_ofa \
     AllLangResTarget_gal \
     AllLangResTarget_textconversiondlgs \
+    UIConfig_svx \
 ))
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 2e35087..d5d3f44 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -26,6 +26,10 @@ $(eval $(call gb_Module_add_targets,sw,\
        Library_sw \
        Library_swd \
        Library_swui \
+))
+
+$(eval $(call gb_Module_add_l10n_targets,sw,\
+    AllLangResTarget_sw \
        UIConfig_sglobal \
        UIConfig_sweb \
        UIConfig_swform \
@@ -35,10 +39,6 @@ $(eval $(call gb_Module_add_targets,sw,\
        UIConfig_qa \
 ))
 
-$(eval $(call gb_Module_add_l10n_targets,sw,\
-    AllLangResTarget_sw \
-))
-
 ifneq ($(DISABLE_SCRIPTING),TRUE)
 
 $(eval $(call gb_Module_add_targets,sw,\
diff --git a/uui/Module_uui.mk b/uui/Module_uui.mk
index c827e41..193bea5 100644
--- a/uui/Module_uui.mk
+++ b/uui/Module_uui.mk
@@ -11,11 +11,11 @@ $(eval $(call gb_Module_Module,uui))
 
 $(eval $(call gb_Module_add_targets,uui,\
        Library_uui \
-       UIConfig_uui \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,uui,\
        AllLangResTarget_uui \
+       UIConfig_uui \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index a65736d..4dc6434 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -25,11 +25,11 @@ $(eval $(call gb_Module_add_targets,vcl,\
     $(if $(filter DESKTOP,$(BUILD_TYPE)), \
                StaticLibrary_vclmain \
                Executable_ui-previewer) \
-    UIConfig_vcl \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,vcl,\
     AllLangResTarget_vcl \
+    UIConfig_vcl \
 ))
 
 ifeq ($(GUIBASE),unx)
diff --git a/xmlsecurity/Module_xmlsecurity.mk 
b/xmlsecurity/Module_xmlsecurity.mk
index d29444c..e88859d 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -13,11 +13,11 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\
        Library_xmlsecurity \
        Library_xsec_fw \
        $(if $(filter-out IOS ANDROID,$(OS)),Library_xsec_xmlsec) \
-       UIConfig_xmlsec \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,xmlsecurity,\
        AllLangResTarget_xsec \
+       UIConfig_xmlsec \
 ))
 
 #FIXME: ^^^, get nss&libxmlsec building on ios and android
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to