From d327a2e280d5e1514d25509bb19096f70dfd2391 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Fri, 14 Dec 2018 21:50:09 +0100 Subject: [PATCH] makefiles: sort (cherry picked from commit d76b4afb8ed9531c1609804b684900a0ea96815c) --- base/Makefile | 4 ++-- daemons/lvmdbusd/Makefile.in | 6 +++--- device_mapper/Makefile | 6 +++--- test/unit/Makefile | 6 +++--- tools/Makefile.in | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/base/Makefile b/base/Makefile index f150ad9e0..6050c3a2a 100644 --- a/base/Makefile +++ b/base/Makefile @@ -18,9 +18,9 @@ # which defined all top_* variables BASE_SOURCE=\ - base/data-struct/radix-tree.c \ base/data-struct/hash.c \ - base/data-struct/list.c + base/data-struct/list.c \ + base/data-struct/radix-tree.c BASE_DEPENDS = $(BASE_SOURCE:%.c=%.d) BASE_OBJECTS = $(BASE_SOURCE:%.c=%.o) diff --git a/daemons/lvmdbusd/Makefile.in b/daemons/lvmdbusd/Makefile.in index 8d5de28ac..da96c344b 100644 --- a/daemons/lvmdbusd/Makefile.in +++ b/daemons/lvmdbusd/Makefile.in @@ -23,11 +23,10 @@ LVMDBUS_SRCDIR_FILES = \ cfg.py \ cmdhandler.py \ fetch.py \ - __init__.py \ job.py \ loader.py \ - main.py \ lv.py \ + main.py \ manager.py \ objectmanager.py \ pv.py \ @@ -35,7 +34,8 @@ LVMDBUS_SRCDIR_FILES = \ state.py \ udevwatch.py \ utils.py \ - vg.py + vg.py \ + __init__.py LVMDBUS_BUILDDIR_FILES = \ lvmdb.py \ diff --git a/device_mapper/Makefile b/device_mapper/Makefile index bb0880d66..fd2189a8c 100644 --- a/device_mapper/Makefile +++ b/device_mapper/Makefile @@ -15,6 +15,7 @@ DEVICE_MAPPER_SOURCE=\ device_mapper/datastruct/bitset.c \ + device_mapper/ioctl/libdm-iface.c \ device_mapper/libdm-common.c \ device_mapper/libdm-config.c \ device_mapper/libdm-deptree.c \ @@ -27,9 +28,8 @@ DEVICE_MAPPER_SOURCE=\ device_mapper/regex/matcher.c \ device_mapper/regex/parse_rx.c \ device_mapper/regex/ttree.c \ - device_mapper/ioctl/libdm-iface.c \ - device_mapper/vdo/vdo_target.c \ - device_mapper/vdo/status.c + device_mapper/vdo/status.c \ + device_mapper/vdo/vdo_target.c DEVICE_MAPPER_DEPENDS = $(DEVICE_MAPPER_SOURCE:%.c=%.d) DEVICE_MAPPER_OBJECTS = $(DEVICE_MAPPER_SOURCE:%.c=%.o) diff --git a/test/unit/Makefile b/test/unit/Makefile index fa6acb623..5b71e1bf5 100644 --- a/test/unit/Makefile +++ b/test/unit/Makefile @@ -20,11 +20,11 @@ UNIT_SOURCE=\ test/unit/config_t.c \ test/unit/dmlist_t.c \ test/unit/dmstatus_t.c \ - test/unit/io_engine_t.c \ - test/unit/radix_tree_t.c \ - test/unit/matcher_t.c \ test/unit/framework.c \ + test/unit/io_engine_t.c \ + test/unit/matcher_t.c \ test/unit/percent_t.c \ + test/unit/radix_tree_t.c \ test/unit/run.c \ test/unit/string_t.c \ test/unit/vdo_t.c diff --git a/tools/Makefile.in b/tools/Makefile.in index 7b29517c0..09768ed71 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -28,6 +28,7 @@ SOURCES =\ lvextend.c \ lvmcmdline.c \ lvmdiskscan.c \ + lvpoll.c \ lvreduce.c \ lvremove.c \ lvrename.c \ @@ -56,10 +57,9 @@ SOURCES =\ vgexport.c \ vgextend.c \ vgimport.c \ + vgimportclone.c \ vgmerge.c \ vgmknodes.c \ - lvpoll.c \ - vgimportclone.c \ vgreduce.c \ vgremove.c \ vgrename.c \