summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <b_michaelsen@openoffice.org>2010-11-26 13:37:22 +0100
committerBjoern Michaelsen <b_michaelsen@openoffice.org>2010-11-26 13:37:22 +0100
commit2bc737661a2c673bd7adfba299ceee02fcab627b (patch)
treeabca656061a2f944c7df1abc9563aca5f2d54efe
parent762f9b32dd3e731fd7f61933d6597c7c9d957fe4 (diff)
gnumake2: sorting all lists in makefiles
-rw-r--r--sw/AllLangResTarget_sw.mk126
-rw-r--r--sw/Library_msword.mk8
-rw-r--r--sw/Library_sw.mk2
-rw-r--r--sw/Library_swd.mk6
-rw-r--r--sw/Library_vbaswobj.mk2
-rw-r--r--sw/Module_sw.mk4
6 files changed, 74 insertions, 74 deletions
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 5d87fa1ae587..e0a2a4994e55 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -65,119 +65,119 @@ $(eval $(call gb_SrsTarget_set_include,sw/res,\
))
$(eval $(call gb_SrsTarget_add_files,sw/res,\
+ sw/source/core/undo/undo.src \
+ sw/source/core/unocore/unocore.src \
sw/source/ui/app/app.src \
- sw/source/ui/app/mn.src \
sw/source/ui/app/error.src \
- sw/source/ui/dialog/abstract.src \
- sw/source/ui/dialog/ascfldlg.src \
- sw/source/ui/dialog/dialog.src \
- sw/source/ui/dialog/docstdlg.src \
- sw/source/ui/dialog/regionsw.src \
- sw/source/ui/dialog/wordcountdialog.src \
- sw/source/ui/chrdlg/chrdlg.src \
+ sw/source/ui/app/mn.src \
sw/source/ui/chrdlg/ccoll.src \
+ sw/source/ui/chrdlg/chardlg.src \
+ sw/source/ui/chrdlg/chrdlg.src \
sw/source/ui/chrdlg/drpcps.src \
- sw/source/ui/chrdlg/swbreak.src \
- sw/source/ui/chrdlg/paradlg.src \
sw/source/ui/chrdlg/numpara.src \
- sw/source/ui/chrdlg/chardlg.src \
+ sw/source/ui/chrdlg/paradlg.src \
+ sw/source/ui/chrdlg/swbreak.src \
+ sw/source/ui/config/mailconfigpage.src \
sw/source/ui/config/optcomp.src \
+ sw/source/ui/config/optdlg.src \
sw/source/ui/config/optload.src \
- sw/source/ui/config/mailconfigpage.src \
sw/source/ui/config/redlopt.src \
- sw/source/ui/config/optdlg.src \
- sw/source/ui/dbui/mmpreparemergepage.src \
- sw/source/ui/dbui/mmgreetingspage.src \
- sw/source/ui/dbui/mmmergepage.src \
- sw/source/ui/dbui/mmoutputtypepage.src \
- sw/source/ui/dbui/mmlayoutpage.src \
- sw/source/ui/dbui/mmaddressblockpage.src \
+ sw/source/ui/dbui/addresslistdialog.src \
sw/source/ui/dbui/createaddresslistdialog.src \
- sw/source/ui/dbui/dbtablepreviewdialog.src \
- sw/source/ui/dbui/mmdocselectpage.src \
sw/source/ui/dbui/customizeaddresslistdialog.src \
+ sw/source/ui/dbui/dbinsdlg.src \
+ sw/source/ui/dbui/dbtablepreviewdialog.src \
+ sw/source/ui/dbui/dbui.src \
sw/source/ui/dbui/mailmergechildwindow.src \
sw/source/ui/dbui/mailmergewizard.src \
- sw/source/ui/dbui/dbinsdlg.src \
- sw/source/ui/dbui/selectdbtabledialog.src \
+ sw/source/ui/dbui/mmaddressblockpage.src \
+ sw/source/ui/dbui/mmdocselectpage.src \
+ sw/source/ui/dbui/mmgreetingspage.src \
+ sw/source/ui/dbui/mmlayoutpage.src \
+ sw/source/ui/dbui/mmmergepage.src \
sw/source/ui/dbui/mmoutputpage.src \
- sw/source/ui/dbui/dbui.src \
- sw/source/ui/dbui/addresslistdialog.src \
- sw/source/ui/dochdl/selglos.src \
+ sw/source/ui/dbui/mmoutputtypepage.src \
+ sw/source/ui/dbui/mmpreparemergepage.src \
+ sw/source/ui/dbui/selectdbtabledialog.src \
+ sw/source/ui/dialog/abstract.src \
+ sw/source/ui/dialog/ascfldlg.src \
+ sw/source/ui/dialog/dialog.src \
+ sw/source/ui/dialog/docstdlg.src \
+ sw/source/ui/dialog/regionsw.src \
+ sw/source/ui/dialog/wordcountdialog.src \
sw/source/ui/dochdl/dochdl.src \
+ sw/source/ui/dochdl/selglos.src \
sw/source/ui/docvw/access.src \
sw/source/ui/docvw/docvw.src \
- sw/source/ui/envelp/mailmrge.src \
- sw/source/ui/envelp/labprt.src \
- sw/source/ui/envelp/label.src \
- sw/source/ui/envelp/envfmt.src \
- sw/source/ui/envelp/labfmt.src \
sw/source/ui/envelp/envelp.src \
- sw/source/ui/envelp/envprt.src \
+ sw/source/ui/envelp/envfmt.src \
sw/source/ui/envelp/envlop.src \
- sw/source/ui/fldui/flddok.src \
- sw/source/ui/fldui/changedb.src \
+ sw/source/ui/envelp/envprt.src \
+ sw/source/ui/envelp/label.src \
+ sw/source/ui/envelp/labfmt.src \
+ sw/source/ui/envelp/labprt.src \
+ sw/source/ui/envelp/mailmrge.src \
sw/source/ui/fldui/DropDownFieldDialog.src \
+ sw/source/ui/fldui/changedb.src \
+ sw/source/ui/fldui/flddb.src \
sw/source/ui/fldui/flddinf.src \
+ sw/source/ui/fldui/flddok.src \
+ sw/source/ui/fldui/fldfunc.src \
sw/source/ui/fldui/fldref.src \
sw/source/ui/fldui/fldtdlg.src \
sw/source/ui/fldui/fldui.src \
- sw/source/ui/fldui/javaedit.src \
- sw/source/ui/fldui/fldfunc.src \
- sw/source/ui/fldui/inpdlg.src \
sw/source/ui/fldui/fldvar.src \
- sw/source/ui/fldui/flddb.src \
+ sw/source/ui/fldui/inpdlg.src \
+ sw/source/ui/fldui/javaedit.src \
sw/source/ui/fmtui/tmpdlg.src \
- sw/source/ui/frmdlg/frmui.src \
- sw/source/ui/frmdlg/cption.src \
sw/source/ui/frmdlg/column.src \
+ sw/source/ui/frmdlg/cption.src \
sw/source/ui/frmdlg/frmpage.src \
+ sw/source/ui/frmdlg/frmui.src \
sw/source/ui/globdoc/globdoc.src \
- sw/source/ui/index/idxmrk.src \
sw/source/ui/index/cnttab.src \
+ sw/source/ui/index/idxmrk.src \
sw/source/ui/index/multmrk.src \
sw/source/ui/lingu/olmenu.src \
- sw/source/ui/misc/docfnote.src \
- sw/source/ui/misc/pgfnote.src \
- sw/source/ui/misc/insfnote.src \
- sw/source/ui/misc/srtdlg.src \
+ sw/source/ui/misc/autocorr.src \
sw/source/ui/misc/bookmark.src \
+ sw/source/ui/misc/docfnote.src \
sw/source/ui/misc/glosbib.src \
- sw/source/ui/misc/num.src \
sw/source/ui/misc/glossary.src \
- sw/source/ui/misc/pggrid.src \
- sw/source/ui/misc/outline.src \
+ sw/source/ui/misc/insfnote.src \
+ sw/source/ui/misc/insrule.src \
sw/source/ui/misc/linenum.src \
+ sw/source/ui/misc/num.src \
sw/source/ui/misc/numberingtypelistbox.src \
+ sw/source/ui/misc/outline.src \
+ sw/source/ui/misc/pgfnote.src \
+ sw/source/ui/misc/pggrid.src \
sw/source/ui/misc/redlndlg.src \
- sw/source/ui/misc/insrule.src \
- sw/source/ui/misc/autocorr.src \
+ sw/source/ui/misc/srtdlg.src \
+ sw/source/ui/ribbar/inputwin.src \
sw/source/ui/ribbar/tbxanchr.src \
sw/source/ui/ribbar/workctrl.src \
- sw/source/ui/ribbar/inputwin.src \
sw/source/ui/shells/shells.src \
sw/source/ui/smartmenu/stmenu.src \
- sw/source/ui/table/colwd.src \
- sw/source/ui/table/tautofmt.src \
- sw/source/ui/table/table.src \
sw/source/ui/table/chartins.src \
- sw/source/ui/table/splittbl.src \
- sw/source/ui/table/rowht.src \
- sw/source/ui/table/instable.src \
+ sw/source/ui/table/colwd.src \
sw/source/ui/table/convert.src \
- sw/source/ui/table/tabledlg.src \
+ sw/source/ui/table/instable.src \
sw/source/ui/table/mergetbl.src \
+ sw/source/ui/table/rowht.src \
+ sw/source/ui/table/splittbl.src \
+ sw/source/ui/table/table.src \
+ sw/source/ui/table/tabledlg.src \
+ sw/source/ui/table/tautofmt.src \
sw/source/ui/uiview/pview.src \
sw/source/ui/uiview/view.src \
- sw/source/core/undo/undo.src \
- sw/source/core/unocore/unocore.src \
- sw/source/ui/utlui/navipi.src \
sw/source/ui/utlui/attrdesc.src \
- sw/source/ui/utlui/poolfmt.src \
+ sw/source/ui/utlui/gloslst.src \
sw/source/ui/utlui/initui.src \
+ sw/source/ui/utlui/navipi.src \
+ sw/source/ui/utlui/poolfmt.src \
sw/source/ui/utlui/unotools.src \
sw/source/ui/utlui/utlui.src \
- sw/source/ui/utlui/gloslst.src \
sw/source/ui/web/web.src \
sw/source/ui/wrtsh/wrtsh.src \
))
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index eb891976fcc2..5aebe867f806 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -48,11 +48,14 @@ $(eval $(call gb_Library_set_defs,msword,\
$(eval $(call gb_Library_add_linked_libs,msword,\
basegfx \
comphelper \
+ cppu \
+ cppuhelper \
+ editeng \
i18nisolang1 \
i18nutil \
icuuc \
- editeng \
msfilter \
+ sal \
sfx \
sot \
stl \
@@ -65,9 +68,6 @@ $(eval $(call gb_Library_add_linked_libs,msword,\
tk \
tl \
ucbhelper \
- cppu \
- cppuhelper \
- sal \
utl \
vcl \
))
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 1e5c1d6f8642..cc1df51d2dba 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -110,8 +110,8 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/core/access/accselectionhelper \
sw/source/core/access/acctable \
sw/source/core/access/acctextframe \
- sw/source/core/access/textmarkuphelper \
sw/source/core/access/parachangetrackinginfo \
+ sw/source/core/access/textmarkuphelper \
sw/source/core/attr/calbck \
sw/source/core/attr/cellatr \
sw/source/core/attr/fmtfollowtextflow \
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk
index 0917c1bdf903..17511d3bf4ed 100644
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@ -49,15 +49,15 @@ $(eval $(call gb_Library_set_defs,swd,\
$(eval $(call gb_Library_add_linked_libs,swd,\
comphelper \
+ cppu \
+ cppuhelper \
+ sal \
sfx \
sot \
svl \
svt \
tl \
ucbhelper \
- cppu \
- cppuhelper \
- sal \
utl \
vcl \
))
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index 669934d80471..44bbfa8a0c6f 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_Library_add_linked_libs,vbaswobj,\
sal \
sb \
sfx \
+ stl \
svl \
svt \
svx \
@@ -65,7 +66,6 @@ $(eval $(call gb_Library_add_linked_libs,vbaswobj,\
utl \
vbahelper \
vcl \
- stl \
))
$(eval $(call gb_Library_add_exception_objects,vbaswobj,\
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 13f511a73b82..ccd570308a35 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -28,15 +28,15 @@
$(eval $(call gb_Module_Module,sw))
$(eval $(call gb_Module_add_targets,sw,\
+ AllLangResTarget_sw \
+ Library_msword \
Library_sw \
Library_swd \
Library_swui \
- Library_msword \
Library_vbaswobj \
Package_misc \
Package_uiconfig \
Package_xml \
- AllLangResTarget_sw \
))
# vim: set noet ts=4 sw=4: