[Libreoffice-commits] core.git: basctl/Module_basctl.mk basctl/UI_basicide.mk basctl/UIConfig_basicide.mk chart2/Module_chart2.mk chart2/UI_chart2.mk chart2/UIConfig_chart2.mk cui/Module_cui.mk cui/UIConfig_cui.mk cui/UI_cui.mk dbaccess/Module_dbaccess.mk dbaccess/UIConfig_dbaccess.mk dbaccess/UI_dbaccess.mk desktop/Module_desktop.mk desktop/UIConfig_deployment.mk desktop/UI_deployment.mk filter/Module_filter.mk filter/UIConfig_xsltdlg.mk filter/UI_xsltdlg.mk Makefile.in padmin/Module_padmin.mk padmin/UIConfig_spa.mk padmin/UI_spa.mk sc/Module_sc.mk sc/UIConfig_scalc.mk sc/UI_scalc.mk sd/Module_sd.mk sd/UIConfig_sdraw.mk sd/UIConfig_simpress.mk sd/UI_sdraw.mk sd/UI_simpress.mk sfx2/Module_sfx2.mk sfx2/UIConfig_sfx.mk sfx2/UI_sfx.mk solenv/gbuild starmath/Module_starmath.mk starmath/UIConfig_smath.mk starmath/UI_smath.mk svtools/Module_svtools.mk svtools/UIConfig_svt.mk svtools/UI_svt.mk svx/Module_svx.mk svx/UIConfig_svx.mk svx/UI_svx.mk sw/Module_sw.mk sw/UIConfig_swriter.mk sw/UI_swrite r.mk tubes/Module_tubes.mk tubes/UIConfig_tubes.mk tubes/UI_tubes.mk uui/Module_uui.mk uui/UIConfig_uui.mk uui/UI_uui.mk vcl/Module_vcl.mk vcl/UIConfig_vcl.mk vcl/UI_vcl.mk xmlsecurity/Module_xmlsecurity.mk xmlsecurity/UIConfig_xmlsec.mk xmlsecurity/UI_xmlsec.mk
David Tardon
dtardon at redhat.com
Wed Apr 10 20:37:51 PDT 2013
Makefile.in | 2
basctl/Module_basctl.mk | 2
basctl/UIConfig_basicide.mk | 16 +++
basctl/UI_basicide.mk | 16 ---
chart2/Module_chart2.mk | 2
chart2/UIConfig_chart2.mk | 16 +++
chart2/UI_chart2.mk | 16 ---
cui/Module_cui.mk | 2
cui/UIConfig_cui.mk | 72 +++++++++++++
cui/UI_cui.mk | 72 -------------
dbaccess/Module_dbaccess.mk | 2
dbaccess/UIConfig_dbaccess.mk | 18 +++
dbaccess/UI_dbaccess.mk | 18 ---
desktop/Module_desktop.mk | 2
desktop/UIConfig_deployment.mk | 17 +++
desktop/UI_deployment.mk | 17 ---
filter/Module_filter.mk | 2
filter/UIConfig_xsltdlg.mk | 17 +++
filter/UI_xsltdlg.mk | 17 ---
padmin/Module_padmin.mk | 2
padmin/UIConfig_spa.mk | 18 +++
padmin/UI_spa.mk | 18 ---
sc/Module_sc.mk | 2
sc/UIConfig_scalc.mk | 30 +++++
sc/UI_scalc.mk | 30 -----
sd/Module_sd.mk | 4
sd/UIConfig_sdraw.mk | 16 +++
sd/UIConfig_simpress.mk | 18 +++
sd/UI_sdraw.mk | 16 ---
sd/UI_simpress.mk | 18 ---
sfx2/Module_sfx2.mk | 2
sfx2/UIConfig_sfx.mk | 28 +++++
sfx2/UI_sfx.mk | 28 -----
solenv/gbuild/Postprocess.mk | 2
solenv/gbuild/TargetLocations.mk | 4
solenv/gbuild/UI.mk | 198 -------------------------------------
solenv/gbuild/UIConfig.mk | 201 ++++++++++++++++++++++++++++++++++++++
solenv/gbuild/gbuild.mk | 2
starmath/Module_starmath.mk | 2
starmath/UIConfig_smath.mk | 16 +++
starmath/UI_smath.mk | 16 ---
svtools/Module_svtools.mk | 2
svtools/UIConfig_svt.mk | 21 +++
svtools/UI_svt.mk | 21 ---
svx/Module_svx.mk | 2
svx/UIConfig_svx.mk | 23 ++++
svx/UI_svx.mk | 23 ----
sw/Module_sw.mk | 2
sw/UIConfig_swriter.mk | 57 ++++++++++
sw/UI_swriter.mk | 57 ----------
tubes/Module_tubes.mk | 2
tubes/UIConfig_tubes.mk | 16 +++
tubes/UI_tubes.mk | 16 ---
uui/Module_uui.mk | 2
uui/UIConfig_uui.mk | 17 +++
uui/UI_uui.mk | 17 ---
vcl/Module_vcl.mk | 2
vcl/UIConfig_vcl.mk | 16 +++
vcl/UI_vcl.mk | 16 ---
xmlsecurity/Module_xmlsecurity.mk | 2
xmlsecurity/UIConfig_xmlsec.mk | 20 +++
xmlsecurity/UI_xmlsec.mk | 20 ---
62 files changed, 677 insertions(+), 674 deletions(-)
New commits:
commit ed729831317430648157918becdaf19840b16b71
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 6 13:10:54 2013 +0200
rename UI to UIConfig
I plan to use it to deliver all */uiconfig files, not just .ui, as a
preliminary step to get rid of postprocess/packconfig.
Change-Id: Ie7b4434b2f247165e3ab69a4d0c193418720a149
Reviewed-on: https://gerrit.libreoffice.org/3225
Reviewed-by: David Tardon <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
diff --git a/Makefile.in b/Makefile.in
index fd4cba6..56b3632 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -120,7 +120,7 @@ gbuild_TARGETS := AllLangHelp \
Pyuno \
Rdb \
StaticLibrary \
- UI \
+ UIConfig \
UnoApi \
UnoApiMerge \
UnpackedTarball \
diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk
index 3542e2b..ddb86ab 100644
--- a/basctl/Module_basctl.mk
+++ b/basctl/Module_basctl.mk
@@ -39,7 +39,7 @@ endif
$(eval $(call gb_Module_add_targets,basctl,\
Package_uiconfig \
- UI_basicide \
+ UIConfig_basicide \
))
# vim: set noet sw=4 ts=4:
diff --git a/basctl/UIConfig_basicide.mk b/basctl/UIConfig_basicide.mk
new file mode 100644
index 0000000..66dfb83
--- /dev/null
+++ b/basctl/UIConfig_basicide.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,modules/BasicIDE))
+
+$(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\
+ basctl/uiconfig/basicide/ui/basicmacrodialog \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/basctl/UI_basicide.mk b/basctl/UI_basicide.mk
deleted file mode 100644
index a808d92..0000000
--- a/basctl/UI_basicide.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UI_UI,modules/BasicIDE))
-
-$(eval $(call gb_UI_add_uifiles,modules/BasicIDE,\
- basctl/uiconfig/basicide/ui/basicmacrodialog \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
index 03fa54b..e8b8567 100644
--- a/chart2/Module_chart2.mk
+++ b/chart2/Module_chart2.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Module_add_targets,chart2,\
Library_chartcontroller \
Library_chartcore \
Package_uiconfig \
- UI_chart2 \
+ UIConfig_chart2 \
))
$(eval $(call gb_Module_add_subsequentcheck_targets,chart2,\
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
new file mode 100644
index 0000000..4c19d79
--- /dev/null
+++ b/chart2/UIConfig_chart2.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,modules/schart))
+
+$(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
+ chart2/uiconfig/ui/smoothlinesdlg \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/chart2/UI_chart2.mk b/chart2/UI_chart2.mk
deleted file mode 100644
index e75f209..0000000
--- a/chart2/UI_chart2.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UI_UI,modules/schart))
-
-$(eval $(call gb_UI_add_uifiles,modules/schart,\
- chart2/uiconfig/ui/smoothlinesdlg \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/cui/Module_cui.mk b/cui/Module_cui.mk
index 895013e..12b3bee 100644
--- a/cui/Module_cui.mk
+++ b/cui/Module_cui.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Module_Module,cui))
$(eval $(call gb_Module_add_targets,cui,\
AllLangResTarget_cui \
Library_cui \
- UI_cui \
+ UIConfig_cui \
))
# vim: set noet sw=4 ts=4:
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
new file mode 100644
index 0000000..3fbdb23
--- /dev/null
+++ b/cui/UIConfig_cui.mk
@@ -0,0 +1,72 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,cui))
+
+$(eval $(call gb_UIConfig_add_uifiles,cui,\
+ cui/uiconfig/ui/aboutdialog \
+ cui/uiconfig/ui/asiantypography \
+ cui/uiconfig/ui/backgroundpage \
+ cui/uiconfig/ui/borderpage \
+ cui/uiconfig/ui/cellalignment \
+ cui/uiconfig/ui/charnamepage \
+ cui/uiconfig/ui/colorpage \
+ cui/uiconfig/ui/comment \
+ cui/uiconfig/ui/gradientpage \
+ cui/uiconfig/ui/colorconfigwin \
+ cui/uiconfig/ui/effectspage \
+ cui/uiconfig/ui/hyphenate \
+ cui/uiconfig/ui/insertfloatingframe \
+ cui/uiconfig/ui/insertoleobject \
+ cui/uiconfig/ui/insertplugin \
+ cui/uiconfig/ui/insertrowcolumn \
+ cui/uiconfig/ui/macroselectordialog \
+ cui/uiconfig/ui/messbox \
+ cui/uiconfig/ui/namedialog \
+ cui/uiconfig/ui/newtabledialog \
+ cui/uiconfig/ui/newtoolbardialog \
+ cui/uiconfig/ui/numberingformatpage \
+ cui/uiconfig/ui/numberingoptionspage \
+ cui/uiconfig/ui/numberingpositionpage \
+ cui/uiconfig/ui/objectnamedialog \
+ cui/uiconfig/ui/objecttitledescdialog \
+ cui/uiconfig/ui/optaccessibilitypage \
+ cui/uiconfig/ui/optadvancedpage \
+ cui/uiconfig/ui/optappearancepage \
+ cui/uiconfig/ui/optfltrpage \
+ cui/uiconfig/ui/optfontspage \
+ cui/uiconfig/ui/optgeneralpage \
+ cui/uiconfig/ui/optmemorypage \
+ cui/uiconfig/ui/optonlineupdatepage \
+ cui/uiconfig/ui/optpathspage \
+ cui/uiconfig/ui/optsavepage \
+ cui/uiconfig/ui/optsecuritypage \
+ cui/uiconfig/ui/optuserpage \
+ cui/uiconfig/ui/optviewpage \
+ cui/uiconfig/ui/pageformatpage \
+ cui/uiconfig/ui/personalization_tab \
+ cui/uiconfig/ui/pickbulletpage \
+ cui/uiconfig/ui/pickgraphicpage \
+ cui/uiconfig/ui/picknumberingpage \
+ cui/uiconfig/ui/pickoutlinepage \
+ cui/uiconfig/ui/positionpage \
+ cui/uiconfig/ui/scriptorganizer \
+ cui/uiconfig/ui/securityoptionsdialog \
+ cui/uiconfig/ui/select_persona_dialog \
+ cui/uiconfig/ui/specialcharacters \
+ cui/uiconfig/ui/spellingdialog \
+ cui/uiconfig/ui/splitcellsdialog \
+ cui/uiconfig/ui/storedwebconnectiondialog \
+ cui/uiconfig/ui/textflowpage \
+ cui/uiconfig/ui/thesaurus \
+ cui/uiconfig/ui/twolinespage \
+ cui/uiconfig/ui/zoomdialog \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
deleted file mode 100644
index c5cf568..0000000
--- a/cui/UI_cui.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UI_UI,cui))
-
-$(eval $(call gb_UI_add_uifiles,cui,\
- cui/uiconfig/ui/aboutdialog \
- cui/uiconfig/ui/asiantypography \
- cui/uiconfig/ui/backgroundpage \
- cui/uiconfig/ui/borderpage \
- cui/uiconfig/ui/cellalignment \
- cui/uiconfig/ui/charnamepage \
- cui/uiconfig/ui/colorpage \
- cui/uiconfig/ui/comment \
- cui/uiconfig/ui/gradientpage \
- cui/uiconfig/ui/colorconfigwin \
- cui/uiconfig/ui/effectspage \
- cui/uiconfig/ui/hyphenate \
- cui/uiconfig/ui/insertfloatingframe \
- cui/uiconfig/ui/insertoleobject \
- cui/uiconfig/ui/insertplugin \
- cui/uiconfig/ui/insertrowcolumn \
- cui/uiconfig/ui/macroselectordialog \
- cui/uiconfig/ui/messbox \
- cui/uiconfig/ui/namedialog \
- cui/uiconfig/ui/newtabledialog \
- cui/uiconfig/ui/newtoolbardialog \
- cui/uiconfig/ui/numberingformatpage \
- cui/uiconfig/ui/numberingoptionspage \
- cui/uiconfig/ui/numberingpositionpage \
- cui/uiconfig/ui/objectnamedialog \
- cui/uiconfig/ui/objecttitledescdialog \
- cui/uiconfig/ui/optaccessibilitypage \
- cui/uiconfig/ui/optadvancedpage \
- cui/uiconfig/ui/optappearancepage \
- cui/uiconfig/ui/optfltrpage \
- cui/uiconfig/ui/optfontspage \
- cui/uiconfig/ui/optgeneralpage \
- cui/uiconfig/ui/optmemorypage \
- cui/uiconfig/ui/optonlineupdatepage \
- cui/uiconfig/ui/optpathspage \
- cui/uiconfig/ui/optsavepage \
- cui/uiconfig/ui/optsecuritypage \
- cui/uiconfig/ui/optuserpage \
- cui/uiconfig/ui/optviewpage \
- cui/uiconfig/ui/pageformatpage \
- cui/uiconfig/ui/personalization_tab \
- cui/uiconfig/ui/pickbulletpage \
- cui/uiconfig/ui/pickgraphicpage \
- cui/uiconfig/ui/picknumberingpage \
- cui/uiconfig/ui/pickoutlinepage \
- cui/uiconfig/ui/positionpage \
- cui/uiconfig/ui/scriptorganizer \
- cui/uiconfig/ui/securityoptionsdialog \
- cui/uiconfig/ui/select_persona_dialog \
- cui/uiconfig/ui/specialcharacters \
- cui/uiconfig/ui/spellingdialog \
- cui/uiconfig/ui/splitcellsdialog \
- cui/uiconfig/ui/storedwebconnectiondialog \
- cui/uiconfig/ui/textflowpage \
- cui/uiconfig/ui/thesaurus \
- cui/uiconfig/ui/twolinespage \
- cui/uiconfig/ui/zoomdialog \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 0e5fe13..598ec42 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Module_add_targets,dbaccess,\
Library_sdbt \
Package_inc \
Package_uiconfig \
- UI_dbaccess \
+ UIConfig_dbaccess \
))
$(eval $(call gb_Module_add_check_targets,dbaccess,\
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
new file mode 100644
index 0000000..eb97972
--- /dev/null
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -0,0 +1,18 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,dbaccess))
+
+$(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
+ dbaccess/uiconfig/ui/querypropertiesdialog \
+ dbaccess/uiconfig/ui/generalpagedialog \
+ dbaccess/uiconfig/ui/generalpagewizard \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/UI_dbaccess.mk b/dbaccess/UI_dbaccess.mk
deleted file mode 100644
index 3468a40..0000000
--- a/dbaccess/UI_dbaccess.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UI_UI,dbaccess))
-
-$(eval $(call gb_UI_add_uifiles,dbaccess, \
- dbaccess/uiconfig/ui/querypropertiesdialog \
- dbaccess/uiconfig/ui/generalpagedialog \
- dbaccess/uiconfig/ui/generalpagewizard \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 73bd229..a814604 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
Library_sofficeapp \
Library_spl \
Package_intro \
- UI_deployment \
+ UIConfig_deployment \
Zip_brand \
Zip_brand_dev \
))
diff --git a/desktop/UIConfig_deployment.mk b/desktop/UIConfig_deployment.mk
new file mode 100644
index 0000000..f23136b
--- /dev/null
+++ b/desktop/UIConfig_deployment.mk
@@ -0,0 +1,17 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,desktop))
+
+$(eval $(call gb_UIConfig_add_uifiles,desktop,\
+ desktop/uiconfig/ui/cmdlinehelp \
+ desktop/uiconfig/ui/extensionmanager \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/desktop/UI_deployment.mk b/desktop/UI_deployment.mk
deleted file mode 100644
index cf68089..0000000
--- a/desktop/UI_deployment.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UI_UI,desktop))
-
-$(eval $(call gb_UI_add_uifiles,desktop,\
- desktop/uiconfig/ui/cmdlinehelp \
- desktop/uiconfig/ui/extensionmanager \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index b13407c..4f241d7 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -66,7 +66,7 @@ $(eval $(call gb_Module_add_targets,filter,\
Package_inc \
Package_docbook \
Package_xslt \
- UI_xsltdlg \
+ UIConfig_xsltdlg \
))
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
diff --git a/filter/UIConfig_xsltdlg.mk b/filter/UIConfig_xsltdlg.mk
new file mode 100644
index 0000000..0a9294d
--- /dev/null
+++ b/filter/UIConfig_xsltdlg.mk
@@ -0,0 +1,17 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,filter))
+
+$(eval $(call gb_UIConfig_add_uifiles,filter,\
+ filter/uiconfig/ui/testxmlfilter \
+ filter/uiconfig/ui/xmlfiltersettings \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/UI_xsltdlg.mk b/filter/UI_xsltdlg.mk
deleted file mode 100644
index 6186789..0000000
--- a/filter/UI_xsltdlg.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UI_UI,filter))
-
-$(eval $(call gb_UI_add_uifiles,filter,\
- filter/uiconfig/ui/testxmlfilter \
- filter/uiconfig/ui/xmlfiltersettings \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/padmin/Module_padmin.mk b/padmin/Module_padmin.mk
index c8d024d..9407b97 100644
--- a/padmin/Module_padmin.mk
+++ b/padmin/Module_padmin.mk
@@ -27,7 +27,7 @@ $(eval $(call gb_Module_add_targets,padmin,\
Library_spa \
AllLangResTarget_spa \
Package_inc \
- UI_spa \
+ UIConfig_spa \
))
endif
diff --git a/padmin/UIConfig_spa.mk b/padmin/UIConfig_spa.mk
new file mode 100644
index 0000000..565f0cc
--- /dev/null
+++ b/padmin/UIConfig_spa.mk
@@ -0,0 +1,18 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,spa))
+
+$(eval $(call gb_UIConfig_add_uifiles,spa,\
+ padmin/uiconfig/ui/printerdevicepage \
+ padmin/uiconfig/ui/printerpaperpage \
+ padmin/uiconfig/ui/printerpropertiesdialog \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/padmin/UI_spa.mk b/padmin/UI_spa.mk
deleted file mode 100644
index 6b1e011..0000000
--- a/padmin/UI_spa.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UI_UI,spa))
-
-$(eval $(call gb_UI_add_uifiles,spa,\
- padmin/uiconfig/ui/printerdevicepage \
- padmin/uiconfig/ui/printerpaperpage \
- padmin/uiconfig/ui/printerpropertiesdialog \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 4a4fc41..2d8231f 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Module_add_targets,sc,\
Library_scfilt \
Library_scui \
Package_uiconfig \
- UI_scalc \
+ UIConfig_scalc \
))
ifneq ($(DISABLE_SCRIPTING),TRUE)
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
new file mode 100644
index 0000000..e6b055f
--- /dev/null
+++ b/sc/UIConfig_scalc.mk
@@ -0,0 +1,30 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,modules/scalc))
+
+$(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
+ sc/uiconfig/scalc/ui/cellprotectionpage \
+ sc/uiconfig/scalc/ui/definename \
+ sc/uiconfig/scalc/ui/deletecontents \
+ sc/uiconfig/scalc/ui/formatcellsdialog \
+ sc/uiconfig/scalc/ui/insertname \
+ sc/uiconfig/scalc/ui/insertsheet \
+ sc/uiconfig/scalc/ui/managenamesdialog \
+ sc/uiconfig/scalc/ui/printeroptions \
+ sc/uiconfig/scalc/ui/sheetprintpage \
+ sc/uiconfig/scalc/ui/selectrange \
+ sc/uiconfig/scalc/ui/sortcriteriapage \
+ sc/uiconfig/scalc/ui/sortkey \
+ sc/uiconfig/scalc/ui/sortoptionspage \
+ sc/uiconfig/scalc/ui/textimportoptions \
+ sc/uiconfig/scalc/ui/textimportcsv \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/UI_scalc.mk b/sc/UI_scalc.mk
deleted file mode 100644
index f7c13f0..0000000
--- a/sc/UI_scalc.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UI_UI,modules/scalc))
-
-$(eval $(call gb_UI_add_uifiles,modules/scalc,\
- sc/uiconfig/scalc/ui/cellprotectionpage \
- sc/uiconfig/scalc/ui/definename \
- sc/uiconfig/scalc/ui/deletecontents \
- sc/uiconfig/scalc/ui/formatcellsdialog \
- sc/uiconfig/scalc/ui/insertname \
- sc/uiconfig/scalc/ui/insertsheet \
- sc/uiconfig/scalc/ui/managenamesdialog \
- sc/uiconfig/scalc/ui/printeroptions \
- sc/uiconfig/scalc/ui/sheetprintpage \
- sc/uiconfig/scalc/ui/selectrange \
- sc/uiconfig/scalc/ui/sortcriteriapage \
- sc/uiconfig/scalc/ui/sortkey \
- sc/uiconfig/scalc/ui/sortoptionspage \
- sc/uiconfig/scalc/ui/textimportoptions \
- sc/uiconfig/scalc/ui/textimportcsv \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 163e6ed..722bb13 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -38,8 +38,8 @@ $(eval $(call gb_Module_add_targets,sd,\
Package_uiconfig \
Package_web \
Package_xml \
- UI_sdraw \
- UI_simpress \
+ UIConfig_sdraw \
+ UIConfig_simpress \
))
ifneq ($(OS),DRAGONFLY)
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
new file mode 100644
index 0000000..7000202
--- /dev/null
+++ b/sd/UIConfig_sdraw.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,modules/sdraw))
+
+$(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
+ sd/uiconfig/sdraw/ui/printeroptions \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
new file mode 100644
index 0000000..00f2849
--- /dev/null
+++ b/sd/UIConfig_simpress.mk
@@ -0,0 +1,18 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,modules/simpress))
+
+$(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
+ sd/uiconfig/simpress/ui/presentationdialog \
+ sd/uiconfig/simpress/ui/printeroptions \
+ sd/uiconfig/simpress/ui/photoalbum \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sd/UI_sdraw.mk b/sd/UI_sdraw.mk
deleted file mode 100644
index c557e66..0000000
--- a/sd/UI_sdraw.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UI_UI,modules/sdraw))
-
-$(eval $(call gb_UI_add_uifiles,modules/sdraw,\
- sd/uiconfig/sdraw/ui/printeroptions \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sd/UI_simpress.mk b/sd/UI_simpress.mk
deleted file mode 100644
index d6cf6e0..0000000
--- a/sd/UI_simpress.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UI_UI,modules/simpress))
-
-$(eval $(call gb_UI_add_uifiles,modules/simpress,\
- sd/uiconfig/simpress/ui/presentationdialog \
- sd/uiconfig/simpress/ui/printeroptions \
- sd/uiconfig/simpress/ui/photoalbum \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk
index 993ee47..4c852b7 100644
--- a/sfx2/Module_sfx2.mk
+++ b/sfx2/Module_sfx2.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Module_add_targets,sfx2,\
Library_sfx \
Package_inc \
Package_sdi \
- UI_sfx \
+ UIConfig_sfx \
))
$(eval $(call gb_Module_add_check_targets,sfx2,\
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
new file mode 100644
index 0000000..2a55193
--- /dev/null
+++ b/sfx2/UIConfig_sfx.mk
@@ -0,0 +1,28 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,sfx))
+
+$(eval $(call gb_UIConfig_add_uifiles,sfx,\
+ sfx2/uiconfig/ui/checkin \
+ sfx2/uiconfig/ui/custominfopage \
+ sfx2/uiconfig/ui/descriptioninfopage \
+ sfx2/uiconfig/ui/documentinfopage \
+ sfx2/uiconfig/ui/documentpropertiesdialog \
+ sfx2/uiconfig/ui/licensedialog \
+ sfx2/uiconfig/ui/managestylepage \
+ sfx2/uiconfig/ui/optprintpage \
+ sfx2/uiconfig/ui/password \
+ sfx2/uiconfig/ui/printeroptionsdialog \
+ sfx2/uiconfig/ui/securityinfopage \
+ sfx2/uiconfig/ui/singletabdialog \
+ sfx2/uiconfig/ui/documentfontspage \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sfx2/UI_sfx.mk b/sfx2/UI_sfx.mk
deleted file mode 100644
index 0b59c7f..0000000
--- a/sfx2/UI_sfx.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UI_UI,sfx))
-
-$(eval $(call gb_UI_add_uifiles,sfx,\
- sfx2/uiconfig/ui/checkin \
- sfx2/uiconfig/ui/custominfopage \
- sfx2/uiconfig/ui/descriptioninfopage \
- sfx2/uiconfig/ui/documentinfopage \
- sfx2/uiconfig/ui/documentpropertiesdialog \
- sfx2/uiconfig/ui/licensedialog \
- sfx2/uiconfig/ui/managestylepage \
- sfx2/uiconfig/ui/optprintpage \
- sfx2/uiconfig/ui/password \
- sfx2/uiconfig/ui/printeroptionsdialog \
- sfx2/uiconfig/ui/securityinfopage \
- sfx2/uiconfig/ui/singletabdialog \
- sfx2/uiconfig/ui/documentfontspage \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Postprocess.mk b/solenv/gbuild/Postprocess.mk
index 3e2a1cf..972a795 100644
--- a/solenv/gbuild/Postprocess.mk
+++ b/solenv/gbuild/Postprocess.mk
@@ -28,7 +28,7 @@ $(call gb_Postprocess_Postprocess,AllLibraries,All libraries)
$(call gb_Postprocess_Postprocess,AllModulesButInstsetNative,All modules but instset,$(WORKDIR)/Module/)
$(call gb_Postprocess_Postprocess,AllPackages,All packages,$(WORKDIR)/Package/)
$(call gb_Postprocess_Postprocess,AllResources,All resources,$(WORKDIR)/AllLangRes/)
-$(call gb_Postprocess_Postprocess,AllUIs,All UI files,$(WORKDIR)/UI/)
+$(call gb_Postprocess_Postprocess,AllUIConfigs,All UI configuration files,$(WORKDIR)/UIConfig/)
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 3ea8951..923f7b6 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -191,7 +191,7 @@ gb_SrsTemplatePartTarget_get_target = $(WORKDIR)/SrsTemplatePartTarget/$(firstwo
gb_SrsTemplateTarget_get_include_dir = $(WORKDIR)/SrsTemplatePartTarget/$(firstword $(subst /, ,$(1)))
gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1)
gb_ThesaurusIndexTarget_get_target = $(WORKDIR)/ThesaurusIndexTarget/$(basename $(1)).idx
-gb_UI_get_target = $(WORKDIR)/UI/$(1)
+gb_UIConfig_get_target = $(WORKDIR)/UIConfig/$(1)
gb_UILocalizeTarget_get_target = $(WORKDIR)/UILocalizeTarget/$(1).done
gb_UILocalizeTarget_get_workdir = $(WORKDIR)/UILocalizeTarget/$(1)
gb_UnoApiTarget_get_external_headers_target = $(WORKDIR)/UnoApiTarget/$(1).external
@@ -306,7 +306,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
CppunitTestFakeExecutable \
CustomTarget \
ExternalProject \
- UI \
+ UIConfig \
UILocalizeTarget \
UnoApiHeadersTarget \
UnoApiTarget \
diff --git a/solenv/gbuild/UI.mk b/solenv/gbuild/UI.mk
deleted file mode 100644
index 1cbb866..0000000
--- a/solenv/gbuild/UI.mk
+++ /dev/null
@@ -1,198 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-# class UILocalizeTarget
-
-# Produces translations for one .ui file.
-
-gb_UILocalizeTarget_WORKDIR := $(WORKDIR)/UILocalizeTarget
-
-gb_UILocalizeTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,uiex)
-gb_UILocalizeTarget_COMMAND := $(call gb_Executable_get_command,uiex)
-
-# If translatable strings from a .ui file are not merged into the
-# respective .po file yet, the produced translated files are empty,
-# which breaks delivery. This hack avoids the problem by creating a
-# dummy translation file.
-$(call gb_UILocalizeTarget_get_workdir,%).ui :
- $(if $(wildcard $@) \
- ,touch $@ \
- ,echo '<?xml version="1.0"?><t></t>' > $@ \
- )
-
-define gb_UILocalizeTarget__command
-$(call gb_Output_announce,$(2),$(true),UIX,1)
-MERGEINPUT=`$(gb_MKTEMP)` && \
-echo $(POFILES) > $${MERGEINPUT} && \
-$(call gb_Helper_abbreviate_dirs,\
- $(gb_UILocalizeTarget_COMMAND) \
- -i $(UI_FILE) \
- -o $(call gb_UILocalizeTarget_get_workdir,$(2)) \
- -l all \
- -m $${MERGEINPUT} \
- && touch $(1) \
-) && \
-rm -rf $${MERGEINPUT}
-endef
-
-$(dir $(call gb_UILocalizeTarget_get_target,%)).dir :
- $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(dir $(call gb_UILocalizeTarget_get_target,%))%/.dir :
- $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(call gb_UILocalizeTarget_get_target,%) : $(gb_UILocalizeTarget_DEPS)
- $(call gb_UILocalizeTarget__command,$@,$*)
-
-.PHONY : $(call gb_UILocalizeTarget_get_clean_target,%)
-$(call gb_UILocalizeTarget_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),UIX,1)
- $(call gb_Helper_abbreviate_dirs,\
- rm -rf $(call gb_UILocalizeTarget_get_target,$*) $(call gb_UILocalizeTarget_get_workdir,$*) \
- )
-
-# Produce translations for one .ui file
-#
-# gb_UILocalizeTarget_UILocalizeTarget target
-define gb_UILocalizeTarget_UILocalizeTarget
-$(call gb_UILocalizeTarget__UILocalizeTarget_impl,$(1),$(wildcard $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)))
-
-endef
-
-# gb_UILocalizeTarget__UILocalizeTarget_impl target pofiles
-define gb_UILocalizeTarget__UILocalizeTarget_impl
-$(call gb_UILocalizeTarget_get_target,$(1)) : POFILES := $(2)
-$(call gb_UILocalizeTarget_get_target,$(1)) : UI_FILE := $(SRCDIR)/$(1).ui
-
-$(call gb_UILocalizeTarget_get_target,$(1)) : $(2)
-$(call gb_UILocalizeTarget_get_target,$(1)) : $(SRCDIR)/$(1).ui
-$(call gb_UILocalizeTarget_get_target,$(1)) :| \
- $(dir $(call gb_UILocalizeTarget_get_target,$(1))).dir \
- $(call gb_UILocalizeTarget_get_workdir,$(1))/.dir
-
-endef
-
-# class UI
-
-# Handles UI description files (suffix .ui) for the new layouting mechanism.
-
-# en-US is the default, so there is no translation for it
-gb_UI_LANGS := $(filter-out en-US,$(gb_WITH_LANG))
-
-$(dir $(call gb_UI_get_target,%)).dir :
- $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(dir $(call gb_UI_get_target,%))%/.dir :
- $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(call gb_UI_get_target,%) :
- $(call gb_Output_announce,$*,$(true),UI ,2)
- $(call gb_Helper_abbreviate_dirs,\
- touch $@ \
- )
-
-.PHONY : $(call gb_UI_get_clean_target,%)
-$(call gb_UI_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),UI ,2)
- $(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_UI_get_target,$*) \
- )
-
-# Translates and delivers a set of .ui files
-#
-# gb_UI_UI modulename
-define gb_UI_UI
-$(call gb_Package_Package_internal,$(1)_ui,$(SRCDIR))
-$(call gb_UI_get_target,$(1)) :| $(dir $(call gb_UI_get_target,$(1))).dir
-$(call gb_UI_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_ui)
-$(call gb_Postprocess_get_target,AllUIs) : $(call gb_UI_get_target,$(1))
-$(call gb_UI_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_ui)
-
-ifneq ($(gb_UI_LANGS),)
-$(call gb_Package_Package_internal,$(1)_ui_localized,$(gb_UILocalizeTarget_WORKDIR))
-$(call gb_UI_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_ui_localized)
-$(call gb_UI_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_ui_localized)
-endif
-
-$$(eval $$(call gb_Module_register_target,$(call gb_UI_get_target,$(1)),$(call gb_UI_get_clean_target,$(1))))
-$(call gb_Helper_make_userfriendly_targets,$(1),UI)
-
-endef
-
-# gb_UI__package_uifile target package destfile srcfile
-define gb_UI__package_uifile
-$(call gb_Package_add_file,$(2),xml/uiconfig/$(1)/ui/$(3),$(4))
-
-endef
-
-# gb_UI__add_uifile target file
-define gb_UI__add_uifile
-$(call gb_UI__package_uifile,$(1),$(1)_ui,$(notdir $(2)).ui,$(2).ui)
-
-endef
-
-# gb_UI__add_uifile_for_lang target file lang
-define gb_UI__add_uifile_for_lang
-$(call gb_UI__package_uifile,$(1),$(1)_ui_localized,res/$(3)/$(notdir $(2)),$(2)/$(3).ui)
-
-endef
-
-# gb_UI__add_translations_impl target uifile langs
-define gb_UI__add_translations_impl
-$(call gb_UILocalizeTarget_UILocalizeTarget,$(2))
-$(call gb_UI_get_target,$(1)) : $(call gb_UILocalizeTarget_get_target,$(2))
-$(call gb_UI_get_clean_target,$(1)) : $(call gb_UILocalizeTarget_get_clean_target,$(2))
-$(call gb_Package_get_preparation_target,$(1)_ui_localized) : $(call gb_UILocalizeTarget_get_target,$(2))
-$(foreach lang,$(3),$(call gb_UI__add_uifile_for_lang,$(1),$(2),$(lang)))
-
-endef
-
-# gb_UI__add_translations target uifile langs qtz
-define gb_UI__add_translations
-$(if $(strip $(3) $(4)),$(call gb_UI__add_translations_impl,$(1),$(2),$(3)))
-$(if $(strip $(4)),$(call gb_UI__add_uifile_for_lang,$(1),$(2),$(strip $(4))))
-
-endef
-
-# Adds translations for languages that have corresponding .po file
-#
-# gb_UI__add_uifile_translations target uifile
-define gb_UI__add_uifile_translations
-$(call gb_UI__add_translations,$(1),$(2),\
- $(foreach lang,$(gb_UI_LANGS),\
- $(if $(wildcard $(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(2))).po),$(lang)) \
- ),\
- $(filter qtz,$(gb_UI_LANGS)) \
-)
-
-endef
-
-# Adds .ui file to the package
-#
-# The file is relative to $(SRCDIR) and without extension.
-#
-# gb_UI_add_uifile target uifile
-define gb_UI_add_uifile
-$(call gb_UI__add_uifile,$(1),$(2))
-
-ifneq ($(gb_UI_LANGS),)
-$(call gb_UI__add_uifile_translations,$(1),$(2))
-endif
-
-endef
-
-# Adds multiple .ui files to the package
-#
-# gb_UI_add_uifiles target uifile(s)
-define gb_UI_add_uifiles
-$(foreach uifile,$(2),$(call gb_UI_add_uifile,$(1),$(uifile)))
-
-endef
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
new file mode 100644
index 0000000..1bd01be
--- /dev/null
+++ b/solenv/gbuild/UIConfig.mk
@@ -0,0 +1,201 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# class UILocalizeTarget
+
+# Produces translations for one .ui file.
+
+gb_UILocalizeTarget_WORKDIR := $(WORKDIR)/UILocalizeTarget
+
+gb_UILocalizeTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,uiex)
+gb_UILocalizeTarget_COMMAND := $(call gb_Executable_get_command,uiex)
+
+# If translatable strings from a .ui file are not merged into the
+# respective .po file yet, the produced translated files are empty,
+# which breaks delivery. This hack avoids the problem by creating a
+# dummy translation file.
+$(call gb_UILocalizeTarget_get_workdir,%).ui :
+ $(if $(wildcard $@) \
+ ,touch $@ \
+ ,echo '<?xml version="1.0"?><t></t>' > $@ \
+ )
+
+define gb_UILocalizeTarget__command
+$(call gb_Output_announce,$(2),$(true),UIX,1)
+MERGEINPUT=`$(gb_MKTEMP)` && \
+echo $(POFILES) > $${MERGEINPUT} && \
+$(call gb_Helper_abbreviate_dirs,\
+ $(gb_UILocalizeTarget_COMMAND) \
+ -i $(UIConfig_FILE) \
+ -o $(call gb_UILocalizeTarget_get_workdir,$(2)) \
+ -l all \
+ -m $${MERGEINPUT} \
+ && touch $(1) \
+) && \
+rm -rf $${MERGEINPUT}
+endef
+
+$(dir $(call gb_UILocalizeTarget_get_target,%)).dir :
+ $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_UILocalizeTarget_get_target,%))%/.dir :
+ $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(call gb_UILocalizeTarget_get_target,%) : $(gb_UILocalizeTarget_DEPS)
+ $(call gb_UILocalizeTarget__command,$@,$*)
+
+.PHONY : $(call gb_UILocalizeTarget_get_clean_target,%)
+$(call gb_UILocalizeTarget_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),UIX,1)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -rf $(call gb_UILocalizeTarget_get_target,$*) $(call gb_UILocalizeTarget_get_workdir,$*) \
+ )
+
+# Produce translations for one .ui file
+#
+# gb_UILocalizeTarget_UILocalizeTarget target
+define gb_UILocalizeTarget_UILocalizeTarget
+$(call gb_UILocalizeTarget__UILocalizeTarget_impl,$(1),$(wildcard $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)))
+
+endef
+
+# gb_UILocalizeTarget__UILocalizeTarget_impl target pofiles
+define gb_UILocalizeTarget__UILocalizeTarget_impl
+$(call gb_UILocalizeTarget_get_target,$(1)) : POFILES := $(2)
+$(call gb_UILocalizeTarget_get_target,$(1)) : UIConfig_FILE := $(SRCDIR)/$(1).ui
+
+$(call gb_UILocalizeTarget_get_target,$(1)) : $(2)
+$(call gb_UILocalizeTarget_get_target,$(1)) : $(SRCDIR)/$(1).ui
+$(call gb_UILocalizeTarget_get_target,$(1)) :| \
+ $(dir $(call gb_UILocalizeTarget_get_target,$(1))).dir \
+ $(call gb_UILocalizeTarget_get_workdir,$(1))/.dir
+
+endef
+
+# class UIConfig
+
+# Handles UI configuration files.
+#
+# This mostly means UI description files (suffix .ui) for the new layouting
+# mechanism.
+
+# en-US is the default, so there is no translation for it
+gb_UIConfig_LANGS := $(filter-out en-US,$(gb_WITH_LANG))
+
+$(dir $(call gb_UIConfig_get_target,%)).dir :
+ $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_UIConfig_get_target,%))%/.dir :
+ $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(call gb_UIConfig_get_target,%) :
+ $(call gb_Output_announce,$*,$(true),UIC,2)
+ $(call gb_Helper_abbreviate_dirs,\
+ touch $@ \
+ )
+
+.PHONY : $(call gb_UIConfig_get_clean_target,%)
+$(call gb_UIConfig_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),UIC,2)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_UIConfig_get_target,$*) \
+ )
+
+# Processes and delivers a set of UI configuration files.
+#
+# gb_UIConfig_UIConfig modulename
+define gb_UIConfig_UIConfig
+$(call gb_Package_Package_internal,$(1)_ui,$(SRCDIR))
+$(call gb_UIConfig_get_target,$(1)) :| $(dir $(call gb_UIConfig_get_target,$(1))).dir
+$(call gb_UIConfig_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_ui)
+$(call gb_Postprocess_get_target,AllUIConfigs) : $(call gb_UIConfig_get_target,$(1))
+$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_ui)
+
+ifneq ($(gb_UIConfig_LANGS),)
+$(call gb_Package_Package_internal,$(1)_ui_localized,$(gb_UILocalizeTarget_WORKDIR))
+$(call gb_UIConfig_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_ui_localized)
+$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_ui_localized)
+endif
+
+$$(eval $$(call gb_Module_register_target,$(call gb_UIConfig_get_target,$(1)),$(call gb_UIConfig_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),UIConfig)
+
+endef
+
+# gb_UIConfig__package_uifile target package destfile srcfile
+define gb_UIConfig__package_uifile
+$(call gb_Package_add_file,$(2),xml/uiconfig/$(1)/ui/$(3),$(4))
+
+endef
+
+# gb_UIConfig__add_uifile target file
+define gb_UIConfig__add_uifile
+$(call gb_UIConfig__package_uifile,$(1),$(1)_ui,$(notdir $(2)).ui,$(2).ui)
+
+endef
+
+# gb_UIConfig__add_uifile_for_lang target file lang
+define gb_UIConfig__add_uifile_for_lang
+$(call gb_UIConfig__package_uifile,$(1),$(1)_ui_localized,res/$(3)/$(notdir $(2)),$(2)/$(3).ui)
+
+endef
+
+# gb_UIConfig__add_translations_impl target uifile langs
+define gb_UIConfig__add_translations_impl
+$(call gb_UILocalizeTarget_UILocalizeTarget,$(2))
+$(call gb_UIConfig_get_target,$(1)) : $(call gb_UILocalizeTarget_get_target,$(2))
+$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_UILocalizeTarget_get_clean_target,$(2))
+$(call gb_Package_get_preparation_target,$(1)_ui_localized) : $(call gb_UILocalizeTarget_get_target,$(2))
+$(foreach lang,$(3),$(call gb_UIConfig__add_uifile_for_lang,$(1),$(2),$(lang)))
+
+endef
+
+# gb_UIConfig__add_translations target uifile langs qtz
+define gb_UIConfig__add_translations
+$(if $(strip $(3) $(4)),$(call gb_UIConfig__add_translations_impl,$(1),$(2),$(3)))
+$(if $(strip $(4)),$(call gb_UIConfig__add_uifile_for_lang,$(1),$(2),$(strip $(4))))
+
+endef
+
+# Adds translations for languages that have corresponding .po file
+#
+# gb_UIConfig__add_uifile_translations target uifile
+define gb_UIConfig__add_uifile_translations
+$(call gb_UIConfig__add_translations,$(1),$(2),\
+ $(foreach lang,$(gb_UIConfig_LANGS),\
+ $(if $(wildcard $(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(2))).po),$(lang)) \
+ ),\
+ $(filter qtz,$(gb_UIConfig_LANGS)) \
+)
+
+endef
+
+# Adds .ui file to the package
+#
+# The file is relative to $(SRCDIR) and without extension.
+#
+# gb_UIConfig_add_uifile target uifile
+define gb_UIConfig_add_uifile
+$(call gb_UIConfig__add_uifile,$(1),$(2))
+
+ifneq ($(gb_UIConfig_LANGS),)
+$(call gb_UIConfig__add_uifile_translations,$(1),$(2))
+endif
+
+endef
+
+# Adds multiple .ui files to the package
+#
+# gb_UIConfig_add_uifiles target uifile(s)
+define gb_UIConfig_add_uifiles
+$(foreach uifile,$(2),$(call gb_UIConfig_add_uifile,$(1),$(uifile)))
+
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 3d2796f..a138cd1 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -320,7 +320,7 @@ include $(foreach class, \
JavaClassSet \
JunitTest \
Module \
- UI \
+ UIConfig \
UnoApiTarget \
UnoApi \
UnoApiMerge \
diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk
index 95578de..897f2f2 100644
--- a/starmath/Module_starmath.mk
+++ b/starmath/Module_starmath.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_Module_add_targets,starmath,\
Library_sm \
Library_smd \
Package_uiconfig \
- UI_smath \
+ UIConfig_smath \
))
$(eval $(call gb_Module_add_check_targets,starmath,\
diff --git a/starmath/UIConfig_smath.mk b/starmath/UIConfig_smath.mk
new file mode 100644
index 0000000..a88475d
--- /dev/null
+++ b/starmath/UIConfig_smath.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,modules/smath))
+
+$(eval $(call gb_UIConfig_add_uifiles,modules/smath,\
+ starmath/uiconfig/smath/ui/printeroptions \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/starmath/UI_smath.mk b/starmath/UI_smath.mk
deleted file mode 100644
index 6cbfb8d..0000000
--- a/starmath/UI_smath.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UI_UI,modules/smath))
-
-$(eval $(call gb_UI_add_uifiles,modules/smath,\
- starmath/uiconfig/smath/ui/printeroptions \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/svtools/Module_svtools.mk b/svtools/Module_svtools.mk
index c2d10c1..a7eb36c 100644
--- a/svtools/Module_svtools.mk
+++ b/svtools/Module_svtools.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Module_add_targets,svtools,\
Library_hatchwindowfactory \
Library_svt \
Package_inc \
- UI_svt \
+ UIConfig_svt \
))
ifneq ($(CROSS_COMPILING),YES)
diff --git a/svtools/UIConfig_svt.mk b/svtools/UIConfig_svt.mk
new file mode 100644
index 0000000..153054f
--- /dev/null
+++ b/svtools/UIConfig_svt.mk
@@ -0,0 +1,21 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,svt))
+
+$(eval $(call gb_UIConfig_add_uifiles,svt,\
+ svtools/uiconfig/ui/addresstemplatedialog \
+ svtools/uiconfig/ui/graphicexport \
+ svtools/uiconfig/ui/placeedit \
+ svtools/uiconfig/ui/printersetupdialog \
+ svtools/uiconfig/ui/restartdialog \
+ svtools/uiconfig/ui/GraphicExportOptionsDialog \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/svtools/UI_svt.mk b/svtools/UI_svt.mk
deleted file mode 100644
index 2e5dc0a..0000000
--- a/svtools/UI_svt.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UI_UI,svt))
-
-$(eval $(call gb_UI_add_uifiles,svt,\
- svtools/uiconfig/ui/addresstemplatedialog \
- svtools/uiconfig/ui/graphicexport \
- svtools/uiconfig/ui/placeedit \
- svtools/uiconfig/ui/printersetupdialog \
- svtools/uiconfig/ui/restartdialog \
- svtools/uiconfig/ui/GraphicExportOptionsDialog \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index d5aceb8..a8b69ad 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Module_add_targets,svx,\
Package_globlmn_hrc \
Package_inc \
Package_sdi \
- UI_svx \
+ UIConfig_svx \
))
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
new file mode 100644
index 0000000..e9bc814
--- /dev/null
+++ b/svx/UIConfig_svx.mk
@@ -0,0 +1,23 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,svx))
+
+$(eval $(call gb_UIConfig_add_uifiles,svx,\
+ svx/uiconfig/ui/acceptrejectchangesdialog \
+ svx/uiconfig/ui/asianphoneticguidedialog \
+ svx/uiconfig/ui/chineseconversiondialog \
+ svx/uiconfig/ui/compressgraphicdialog \
+ svx/uiconfig/ui/headfootformatpage \
+ svx/uiconfig/ui/redlinecontrol \
+ svx/uiconfig/ui/redlinefilterpage \
+ svx/uiconfig/ui/redlineviewpage \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/svx/UI_svx.mk b/svx/UI_svx.mk
deleted file mode 100644
index f7e28ae..0000000
--- a/svx/UI_svx.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UI_UI,svx))
-
-$(eval $(call gb_UI_add_uifiles,svx,\
- svx/uiconfig/ui/acceptrejectchangesdialog \
- svx/uiconfig/ui/asianphoneticguidedialog \
- svx/uiconfig/ui/chineseconversiondialog \
- svx/uiconfig/ui/compressgraphicdialog \
- svx/uiconfig/ui/headfootformatpage \
- svx/uiconfig/ui/redlinecontrol \
- svx/uiconfig/ui/redlinefilterpage \
- svx/uiconfig/ui/redlineviewpage \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 2f6e75b..d85712f 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_Module_add_targets,sw,\
Library_swd \
Library_swui \
Package_uiconfig \
- UI_swriter \
+ UIConfig_swriter \
))
ifneq ($(DISABLE_SCRIPTING),TRUE)
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
new file mode 100644
index 0000000..6857a06
--- /dev/null
+++ b/sw/UIConfig_swriter.mk
@@ -0,0 +1,57 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,modules/swriter))
+
+$(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
+ sw/uiconfig/swriter/ui/autoformattable \
+ sw/uiconfig/swriter/ui/autotext \
+ sw/uiconfig/swriter/ui/bibliographyentry \
+ sw/uiconfig/swriter/ui/bulletsandnumbering \
+ sw/uiconfig/swriter/ui/captionoptions \
+ sw/uiconfig/swriter/ui/characterproperties \
+ sw/uiconfig/swriter/ui/charurlpage \
+ sw/uiconfig/swriter/ui/columndialog \
+ sw/uiconfig/swriter/ui/columnpage \
+ sw/uiconfig/swriter/ui/columnwidth \
+ sw/uiconfig/swriter/ui/converttexttable \
+ sw/uiconfig/swriter/ui/endnotepage \
+ sw/uiconfig/swriter/ui/editcategories \
+ sw/uiconfig/swriter/ui/exchangedatabases \
+ sw/uiconfig/swriter/ui/formattablepage \
+ sw/uiconfig/swriter/ui/footnotepage \
+ sw/uiconfig/swriter/ui/footnoteareapage \
+ sw/uiconfig/swriter/ui/indexentry \
+ sw/uiconfig/swriter/ui/insertbookmark \
+ sw/uiconfig/swriter/ui/insertbreak \
+ sw/uiconfig/swriter/ui/insertcaption \
+ sw/uiconfig/swriter/ui/insertfootnote \
+ sw/uiconfig/swriter/ui/insertscript \
+ sw/uiconfig/swriter/ui/inserttable \
+ sw/uiconfig/swriter/ui/linenumbering \
+ sw/uiconfig/swriter/ui/opttestpage \
+ sw/uiconfig/swriter/ui/outlinenumbering \
+ sw/uiconfig/swriter/ui/outlinenumberingpage \
+ sw/uiconfig/swriter/ui/outlinepositionpage \
+ sw/uiconfig/swriter/ui/printoptionspage \
+ sw/uiconfig/swriter/ui/printeroptions \
+ sw/uiconfig/swriter/ui/rowheight \
+ sw/uiconfig/swriter/ui/sortdialog \
+ sw/uiconfig/swriter/ui/splittable \
+ sw/uiconfig/swriter/ui/statisticsinfopage \
+ sw/uiconfig/swriter/ui/stringinput \
+ sw/uiconfig/swriter/ui/tablecolumnpage \
+ sw/uiconfig/swriter/ui/tableproperties \
+ sw/uiconfig/swriter/ui/tabletextflowpage \
+ sw/uiconfig/swriter/ui/textgridpage \
+ sw/uiconfig/swriter/ui/titlepage \
+ sw/uiconfig/swriter/ui/wordcount \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
deleted file mode 100644
index 1ae6c0c..0000000
--- a/sw/UI_swriter.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UI_UI,modules/swriter))
-
-$(eval $(call gb_UI_add_uifiles,modules/swriter,\
- sw/uiconfig/swriter/ui/autoformattable \
- sw/uiconfig/swriter/ui/autotext \
- sw/uiconfig/swriter/ui/bibliographyentry \
- sw/uiconfig/swriter/ui/bulletsandnumbering \
- sw/uiconfig/swriter/ui/captionoptions \
- sw/uiconfig/swriter/ui/characterproperties \
- sw/uiconfig/swriter/ui/charurlpage \
- sw/uiconfig/swriter/ui/columndialog \
- sw/uiconfig/swriter/ui/columnpage \
- sw/uiconfig/swriter/ui/columnwidth \
- sw/uiconfig/swriter/ui/converttexttable \
- sw/uiconfig/swriter/ui/endnotepage \
- sw/uiconfig/swriter/ui/editcategories \
- sw/uiconfig/swriter/ui/exchangedatabases \
- sw/uiconfig/swriter/ui/formattablepage \
- sw/uiconfig/swriter/ui/footnotepage \
- sw/uiconfig/swriter/ui/footnoteareapage \
- sw/uiconfig/swriter/ui/indexentry \
- sw/uiconfig/swriter/ui/insertbookmark \
- sw/uiconfig/swriter/ui/insertbreak \
- sw/uiconfig/swriter/ui/insertcaption \
- sw/uiconfig/swriter/ui/insertfootnote \
- sw/uiconfig/swriter/ui/insertscript \
- sw/uiconfig/swriter/ui/inserttable \
- sw/uiconfig/swriter/ui/linenumbering \
- sw/uiconfig/swriter/ui/opttestpage \
- sw/uiconfig/swriter/ui/outlinenumbering \
- sw/uiconfig/swriter/ui/outlinenumberingpage \
- sw/uiconfig/swriter/ui/outlinepositionpage \
- sw/uiconfig/swriter/ui/printoptionspage \
- sw/uiconfig/swriter/ui/printeroptions \
- sw/uiconfig/swriter/ui/rowheight \
- sw/uiconfig/swriter/ui/sortdialog \
- sw/uiconfig/swriter/ui/splittable \
- sw/uiconfig/swriter/ui/statisticsinfopage \
- sw/uiconfig/swriter/ui/stringinput \
- sw/uiconfig/swriter/ui/tablecolumnpage \
- sw/uiconfig/swriter/ui/tableproperties \
- sw/uiconfig/swriter/ui/tabletextflowpage \
- sw/uiconfig/swriter/ui/textgridpage \
- sw/uiconfig/swriter/ui/titlepage \
- sw/uiconfig/swriter/ui/wordcount \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/tubes/Module_tubes.mk b/tubes/Module_tubes.mk
index dc0bba8..703df3c 100644
--- a/tubes/Module_tubes.mk
+++ b/tubes/Module_tubes.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Module_add_targets,tubes,\
Executable_liboapprover \
Library_tubes \
Package_inc \
- UI_tubes \
+ UIConfig_tubes \
))
$(eval $(call gb_Module_add_subsequentcheck_targets,tubes,\
diff --git a/tubes/UIConfig_tubes.mk b/tubes/UIConfig_tubes.mk
new file mode 100644
index 0000000..43a0feb
--- /dev/null
+++ b/tubes/UIConfig_tubes.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,tubes))
+
+$(eval $(call gb_UIConfig_add_uifiles,tubes,\
+ tubes/uiconfig/ui/contacts \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/tubes/UI_tubes.mk b/tubes/UI_tubes.mk
deleted file mode 100644
index 59801da..0000000
--- a/tubes/UI_tubes.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UI_UI,tubes))
-
-$(eval $(call gb_UI_add_uifiles,tubes,\
- tubes/uiconfig/ui/contacts \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/uui/Module_uui.mk b/uui/Module_uui.mk
index e70e94e..0f60a5b 100644
--- a/uui/Module_uui.mk
+++ b/uui/Module_uui.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Module_Module,uui))
$(eval $(call gb_Module_add_targets,uui,\
AllLangResTarget_uui \
Library_uui \
- UI_uui \
+ UIConfig_uui \
))
# vim: set noet sw=4 ts=4:
diff --git a/uui/UIConfig_uui.mk b/uui/UIConfig_uui.mk
new file mode 100644
index 0000000..3b34479
--- /dev/null
+++ b/uui/UIConfig_uui.mk
@@ -0,0 +1,17 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,uui))
+
+$(eval $(call gb_UIConfig_add_uifiles,uui,\
+ uui/uiconfig/ui/masterpassworddlg \
+ uui/uiconfig/ui/setmasterpassworddlg \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/uui/UI_uui.mk b/uui/UI_uui.mk
deleted file mode 100644
index 826b4ed..0000000
--- a/uui/UI_uui.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UI_UI,uui))
-
-$(eval $(call gb_UI_add_uifiles,uui,\
- uui/uiconfig/ui/masterpassworddlg \
- uui/uiconfig/ui/setmasterpassworddlg \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 116e815..1218904 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -27,7 +27,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
$(if $(filter DESKTOP,$(BUILD_TYPE)), \
StaticLibrary_vclmain \
Executable_ui-previewer) \
- UI_vcl \
+ UIConfig_vcl \
))
ifeq ($(GUIBASE),unx)
diff --git a/vcl/UIConfig_vcl.mk b/vcl/UIConfig_vcl.mk
new file mode 100644
index 0000000..ff6db5b
--- /dev/null
+++ b/vcl/UIConfig_vcl.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,vcl))
+
+$(eval $(call gb_UIConfig_add_uifiles,vcl,\
+ vcl/uiconfig/ui/printdialog \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/UI_vcl.mk b/vcl/UI_vcl.mk
deleted file mode 100644
index b39bb78..0000000
--- a/vcl/UI_vcl.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UI_UI,vcl))
-
-$(eval $(call gb_UI_add_uifiles,vcl,\
- vcl/uiconfig/ui/printdialog \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk
index d6f66ba..88dee89 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\
Library_xmlsecurity \
Library_xsec_fw \
$(if $(filter-out IOS ANDROID,$(OS)),Library_xsec_xmlsec) \
- UI_xmlsec \
+ UIConfig_xmlsec \
))
#FIXME: ^^^, get nss&libxmlsec building on ios and android
diff --git a/xmlsecurity/UIConfig_xmlsec.mk b/xmlsecurity/UIConfig_xmlsec.mk
new file mode 100644
index 0000000..5bc39e9
--- /dev/null
+++ b/xmlsecurity/UIConfig_xmlsec.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UIConfig_UIConfig,xmlsec))
+
+$(eval $(call gb_UIConfig_add_uifiles,xmlsec,\
+ xmlsecurity/uiconfig/ui/digitalsignaturesdialog \
+ xmlsecurity/uiconfig/ui/securitylevelpage \
+ xmlsecurity/uiconfig/ui/securitytrustpage \
+ xmlsecurity/uiconfig/ui/selectcertificatedialog \
+ xmlsecurity/uiconfig/ui/macrosecuritydialog \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/UI_xmlsec.mk b/xmlsecurity/UI_xmlsec.mk
deleted file mode 100644
index e07a558..0000000
--- a/xmlsecurity/UI_xmlsec.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UI_UI,xmlsec))
-
-$(eval $(call gb_UI_add_uifiles,xmlsec,\
- xmlsecurity/uiconfig/ui/digitalsignaturesdialog \
- xmlsecurity/uiconfig/ui/securitylevelpage \
- xmlsecurity/uiconfig/ui/securitytrustpage \
- xmlsecurity/uiconfig/ui/selectcertificatedialog \
- xmlsecurity/uiconfig/ui/macrosecuritydialog \
-))
-
-# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list