gnumake2: sorting all lists in makefiles

svl/Library_fsstorage.mk

@@ -53,8 +53,8 @@ $(eval $(call gb_Library_add_linked_libs,fsstorage,\
 ))
 
 $(eval $(call gb_Library_add_linked_system_libs,fsstorage,\
-    icuuc \
     dl \
+    icuuc \
     m \
     pthread \
 ))

svl/Library_passwordcontainer.mk

@@ -42,12 +42,12 @@ $(eval $(call gb_Library_set_include,passwordcontainer,\
 ))
 
 $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
-    utl \
-    ucbhelper \
-    cppuhelper \
     cppu \
+    cppuhelper \
     sal \
     stl \
+    ucbhelper \
+    utl \
 ))
 
 $(eval $(call gb_Library_add_linked_system_libs,passwordcontainer,\

svl/Library_svl.mk

@@ -67,8 +67,8 @@ $(eval $(call gb_Library_add_linked_libs,svl,\
 ))
 
 $(eval $(call gb_Library_add_linked_system_libs,svl,\
-    icuuc \
     dl \
+    icuuc \
     m \
     pthread \
 ))

svtools/Executable_bmp.mk

@@ -40,11 +40,11 @@ $(eval $(call gb_Executable_set_include,bmp,\
 ))
 
 $(eval $(call gb_Executable_add_linked_libs,bmp,\
+    sal \
     stl \
-    vcl \
     tl \
+    vcl \
     vos3 \
-    sal \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,bmp,\
@@ -64,8 +64,8 @@ endif
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Executable_add_linked_libs,bmp,\
-   pthread \
    dl \
+   pthread \
 ))
 endif
 # vim: set noet sw=4 ts=4:

svtools/Executable_bmpsum.mk

@@ -37,11 +37,11 @@ $(eval $(call gb_Executable_set_include,bmpsum,\
 ))
 
 $(eval $(call gb_Executable_add_linked_libs,bmpsum,\
+    sal \
     stl \
-    vcl \
     tl \
+    vcl \
     vos3 \
-    sal \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,bmpsum,\
@@ -60,8 +60,8 @@ endif
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Executable_add_linked_libs,bmpsum,\
-   pthread \
    dl \
+   pthread \
 ))
 endif
 # vim: set noet sw=4 ts=4:

svtools/Executable_g2g.mk

@@ -38,12 +38,12 @@ $(eval $(call gb_Executable_set_include,g2g,\
 
 $(eval $(call gb_Executable_add_linked_libs,g2g,\
     jvmfwk \
+    sal \
     stl \
-    vcl \
+    svt \
     tl \
+    vcl \
     vos3 \
-    svt \
-    sal \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,g2g,\

svtools/Library_hatchwindowfactory.mk

@@ -41,19 +41,19 @@ $(eval $(call gb_Library_set_include,hatchwindowfactory,\
 ))
 
 $(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
-    tk \
-    tl \
     cppu \
     cppuhelper \
     sal \
+    tk \
+    tl \
     vcl \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,hatchwindowfactory,\
-    svtools/source/hatchwindow/hatchwindowfactory \
     svtools/source/hatchwindow/documentcloser \
-    svtools/source/hatchwindow/ipwin \
     svtools/source/hatchwindow/hatchwindow \
+    svtools/source/hatchwindow/hatchwindowfactory \
+    svtools/source/hatchwindow/ipwin \
 ))
 
 ifeq ($(OS),LINUX)

svtools/Library_productregistration.mk

@@ -41,13 +41,13 @@ $(eval $(call gb_Library_set_include,productregistration,\
 ))
 
 $(eval $(call gb_Library_add_linked_libs,productregistration,\
-    svl \
-    tk \
-    tl \
     cppu \
     cppuhelper \
     sal \
     stl \
+    svl \
+    tk \
+    tl \
     utl \
     vcl \
 ))

svtools/Library_svt.mk

@@ -178,10 +178,10 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/edit/textwindowpeer \
     svtools/source/edit/txtattr \
     svtools/source/edit/xtextedt \
-    svtools/source/filter.vcl/filter/exportdialog \
     svtools/source/filter.vcl/filter/FilterConfigCache \
     svtools/source/filter.vcl/filter/FilterConfigItem \
     svtools/source/filter.vcl/filter/SvFilterOptionsDialog \
+    svtools/source/filter.vcl/filter/exportdialog \
     svtools/source/filter.vcl/filter/filter \
     svtools/source/filter.vcl/filter/filter2 \
     svtools/source/filter.vcl/filter/sgfbram \

toolkit/Library_tk.mk

@@ -50,17 +50,18 @@ $(eval $(call gb_Library_set_defs,tk,\
 
 $(eval $(call gb_Library_add_linked_libs,tk,\
     comphelper \
-    stl \
-    tl \
     cppu \
     cppuhelper \
     sal \
+    stl \
+    tl \
     utl \
     vcl \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,tk,\
     toolkit/source/awt/asynccallback \
+    toolkit/source/awt/stylesettings \
     toolkit/source/awt/vclxaccessiblecomponent \
     toolkit/source/awt/vclxbitmap \
     toolkit/source/awt/vclxbutton \
@@ -86,7 +87,6 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
     toolkit/source/awt/vclxwindow \
     toolkit/source/awt/vclxwindow1 \
     toolkit/source/awt/vclxwindows \
-    toolkit/source/awt/stylesettings \
     toolkit/source/awt/xsimpleanimation \
     toolkit/source/awt/xthrobber \
     toolkit/source/controls/accessiblecontrolcontext \

toolkit/Module_toolkit.mk

@@ -28,11 +28,11 @@
 $(eval $(call gb_Module_Module,toolkit))
 
 $(eval $(call gb_Module_add_targets,toolkit,\
+    AllLangResTarget_tk \
     Library_tk \
     Package_inc \
     Package_source \
     Package_util \
-    AllLangResTarget_tk \
 ))
 
 # vim: set noet sw=4 ts=4:

toolkit/Package_source.mk

@@ -26,7 +26,6 @@
 #*************************************************************************
 
 $(eval $(call gb_Package_Package,toolkit_source,$(SRCDIR)/toolkit/source))
-$(eval $(call gb_Package_add_file,toolkit_source,inc/toolkit/awt/vclxdialog.hxx,awt/vclxdialog.hxx))
 $(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/bin.hxx,layout/core/bin.hxx))
 $(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/box-base.hxx,layout/core/box-base.hxx))
 $(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/box.hxx,layout/core/box.hxx))
@@ -45,3 +44,4 @@ $(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/timer.hxx,layou
 $(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/translate.hxx,layout/core/translate.hxx))
 $(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/vcl.hxx,layout/core/vcl.hxx))
 $(eval $(call gb_Package_add_file,toolkit_source,inc/layout/vcl/wrapper.hxx,layout/vcl/wrapper.hxx))
+$(eval $(call gb_Package_add_file,toolkit_source,inc/toolkit/awt/vclxdialog.hxx,awt/vclxdialog.hxx))

tools/Executable_mkunroll.mk

@@ -60,17 +60,17 @@ $(eval $(call gb_Executable_add_exception_objects,mkunroll,\
 ifeq ($(OS),WNT)
 $(eval $(call gb_Executable_add_linked_libs,mkunroll,\
     kernel32 \
-    user32 \
     msvcrt \
     oldnames \
+    user32 \
     uwinapi \
 ))
 endif
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Executable_add_linked_libs,mkunroll,\
-    pthread \
     dl \
+    pthread \
 ))
 endif
 

tools/Executable_rscdep.mk

@@ -58,17 +58,17 @@ ifeq ($(OS),WNT)
 $(eval $(call gb_Executable_add_linked_libs,rscdep,\
     gnu_getopt \
     kernel32 \
-    user32 \
     msvcrt \
     oldnames \
+    user32 \
     uwinapi \
 ))
 endif
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Executable_add_linked_libs,rscdep,\
-    pthread \
     dl \
+    pthread \
 ))
 endif
 # vim: set noet sw=4 ts=4:

tools/Executable_so_checksum.mk

@@ -53,17 +53,17 @@ $(eval $(call gb_Executable_add_exception_objects,so_checksum,\
 ifeq ($(OS),WNT)
 $(eval $(call gb_Executable_add_linked_libs,so_checksum,\
     kernel32 \
-    user32 \
     msvcrt \
     oldnames \
+    user32 \
     uwinapi \
 ))
 endif
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Executable_add_linked_libs,so_checksum,\
-    pthread \
     dl \
+    pthread \
 ))
 endif
 # vim: set noet sw=4 ts=4:

tools/Executable_sspretty.mk

@@ -58,17 +58,17 @@ $(eval $(call gb_Executable_add_exception_objects,sspretty,\
 ifeq ($(OS),WNT)
 $(eval $(call gb_Executable_add_linked_libs,sspretty,\
     kernel32 \
-    user32 \
     msvcrt \
     oldnames \
+    user32 \
     uwinapi \
 ))
 endif
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Executable_add_linked_libs,sspretty,\
-    pthread \
     dl \
+    pthread \
 ))
 endif
 # vim: set noet sw=4 ts=4:

tools/Package_inc.mk

@@ -26,6 +26,7 @@
 #*************************************************************************
 
 $(eval $(call gb_Package_Package,tools_inc,$(SRCDIR)/tools/inc))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/StringListResource.hxx,tools/StringListResource.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/appendunixshellword.hxx,tools/appendunixshellword.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/b3dtrans.hxx,tools/b3dtrans.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/bigint.hxx,tools/bigint.hxx))
@@ -87,7 +88,6 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/solarmutex.hxx,tools/solar
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/stack.hxx,tools/stack.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/stream.hxx,tools/stream.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/string.hxx,tools/string.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/StringListResource.hxx,tools/StringListResource.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/svborder.hxx,tools/svborder.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/svlibrary.hxx,tools/svlibrary.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/svwin.h,tools/svwin.h))
@@ -96,8 +96,8 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/tempfile.hxx,tools/tempfil
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/tenccvt.hxx,tools/tenccvt.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/testtoolloader.hxx,tools/testtoolloader.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/time.hxx,tools/time.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/toolsdllapi.h,tools/toolsdllapi.h))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/tools.h,tools/tools.h))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/toolsdllapi.h,tools/toolsdllapi.h))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqid.hxx,tools/unqid.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqidx.hxx,tools/unqidx.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlobj.hxx,tools/urlobj.hxx))