diff options
author | Christoph Hellwig <hch@lst.de> | 2009-03-30 23:27:02 -0400 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2009-03-30 23:27:02 -0400 |
commit | 2a40a8aed083d988df6822bb9b1b08fb7ce21e1d (patch) | |
tree | 73b814307d6c6beaea2013496518696f515f7cf4 | |
parent | 3dbd8c2e3ff0185585e068f190289d2a267a3e83 (diff) |
cleanup drivers/md/Makefile
Use the -y variables instead of the old -objs so we can easily add
conditional objects to the modules. Also always use += to add
subobjects to avoid problems when placing additional objects in
some place in the file.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: NeilBrown <neilb@suse.de>
-rw-r--r-- | drivers/md/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/md/Makefile b/drivers/md/Makefile index 72880b7e28d9..3b118da575ee 100644 --- a/drivers/md/Makefile +++ b/drivers/md/Makefile | |||
@@ -2,20 +2,20 @@ | |||
2 | # Makefile for the kernel software RAID and LVM drivers. | 2 | # Makefile for the kernel software RAID and LVM drivers. |
3 | # | 3 | # |
4 | 4 | ||
5 | dm-mod-objs := dm.o dm-table.o dm-target.o dm-linear.o dm-stripe.o \ | 5 | dm-mod-y += dm.o dm-table.o dm-target.o dm-linear.o dm-stripe.o \ |
6 | dm-ioctl.o dm-io.o dm-kcopyd.o dm-sysfs.o | 6 | dm-ioctl.o dm-io.o dm-kcopyd.o dm-sysfs.o |
7 | dm-multipath-objs := dm-path-selector.o dm-mpath.o | 7 | dm-multipath-y += dm-path-selector.o dm-mpath.o |
8 | dm-snapshot-objs := dm-snap.o dm-exception-store.o dm-snap-transient.o \ | 8 | dm-snapshot-y += dm-snap.o dm-exception-store.o dm-snap-transient.o \ |
9 | dm-snap-persistent.o | 9 | dm-snap-persistent.o |
10 | dm-mirror-objs := dm-raid1.o | 10 | dm-mirror-y += dm-raid1.o |
11 | md-mod-objs := md.o bitmap.o | 11 | md-mod-y += md.o bitmap.o |
12 | raid456-objs := raid5.o raid6algos.o raid6recov.o raid6tables.o \ | 12 | raid456-y += raid5.o raid6algos.o raid6recov.o raid6tables.o \ |
13 | raid6int1.o raid6int2.o raid6int4.o \ | 13 | raid6int1.o raid6int2.o raid6int4.o \ |
14 | raid6int8.o raid6int16.o raid6int32.o \ | 14 | raid6int8.o raid6int16.o raid6int32.o \ |
15 | raid6altivec1.o raid6altivec2.o raid6altivec4.o \ | 15 | raid6altivec1.o raid6altivec2.o raid6altivec4.o \ |
16 | raid6altivec8.o \ | 16 | raid6altivec8.o \ |
17 | raid6mmx.o raid6sse1.o raid6sse2.o | 17 | raid6mmx.o raid6sse1.o raid6sse2.o |
18 | hostprogs-y := mktables | 18 | hostprogs-y += mktables |
19 | 19 | ||
20 | # Note: link order is important. All raid personalities | 20 | # Note: link order is important. All raid personalities |
21 | # and must come before md.o, as they each initialise | 21 | # and must come before md.o, as they each initialise |