FIX: Set proper raid disks during migration

[thirdparty/mdadm.git] / Makefile

diff --git a/Makefile b/Makefile
index 6bdaed95289a8535c1d7cc72cafd96168b1e626a..72087bea8139f5b1eff934a8cf8f56b07a1c7742 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -107,7 +107,7 @@ OBJS =  mdadm.o config.o policy.o mdstat.o  ReadMe.o util.o maps.o lib.o \
        restripe.o sysfs.o sha1.o mapfile.o crc32.o sg_io.o msg.o \
        platform-intel.o probe_roms.o
 
-OBJSX = restripe.o
+CHECK_OBJS = restripe.o sysfs.o maps.o lib.o
 
 SRCS =  $(patsubst %.o,%.c,$(OBJS))
 
@@ -136,22 +136,23 @@ ASSEMBLE_SRCS += $(ASSEMBLE_AUTO_SRCS)
 ASSEMBLE_FLAGS += -DMDASSEMBLE_AUTO
 endif
 
-all : mdadm mdmon mdadm.man md.man mdadm.conf.man mdmon.man
+all : mdadm mdmon
+man : mdadm.man md.man mdadm.conf.man mdmon.man
 
 everything: all mdadm.static swap_super test_stripe \
        mdassemble mdassemble.auto mdassemble.static mdassemble.man \
-       mdadm.Os mdadm.O2
+       mdadm.Os mdadm.O2 man
 everything-test: all mdadm.static swap_super test_stripe \
        mdassemble.auto mdassemble.static mdassemble.man \
-       mdadm.Os mdadm.O2
+       mdadm.Os mdadm.O2 man
 # mdadm.uclibc and mdassemble.uclibc don't work on x86-64
 # mdadm.tcc doesn't work..
 
 mdadm : $(OBJS)
-       $(CC) $(LDFLAGS) -o mdadm $(OBJS) $(LDLIBS)
+       $(CC) $(CFLAGS) $(LDFLAGS) -o mdadm $(OBJS) $(LDLIBS)
 
 mdadm.static : $(OBJS) $(STATICOBJS)
-       $(CC) $(LDFLAGS) -static -o mdadm.static $(OBJS) $(STATICOBJS)
+       $(CC) $(CFLAGS) $(LDFLAGS) -static -o mdadm.static $(OBJS) $(STATICOBJS)
 
 mdadm.tcc : $(SRCS) $(INCL)
        $(TCC) -o mdadm.tcc $(SRCS)
@@ -171,14 +172,14 @@ mdmon.O2 : $(MON_SRCS) $(INCL) mdmon.h
 
 # use '-z now' to guarantee no dynamic linker interactions with the monitor thread
 mdmon : $(MON_OBJS)
-       $(CC) $(LDFLAGS) $(MON_LDFLAGS) -Wl,-z,now -o mdmon $(MON_OBJS) $(LDLIBS)
+       $(CC) $(CFLAGS) $(LDFLAGS) $(MON_LDFLAGS) -Wl,-z,now -o mdmon $(MON_OBJS) $(LDLIBS)
 msg.o: msg.c msg.h
 
 test_stripe : restripe.c mdadm.h
        $(CC) $(CXFLAGS) $(LDFLAGS) -o test_stripe -DMAIN restripe.c
 
-raid6check : raid6check.o mdadm.h $(OBJSX)
-       $(CC) $(CXFLAGS) $(LDFLAGS) -o raid6check raid6check.o $(OBJSX)
+raid6check : raid6check.o mdadm.h $(CHECK_OBJS)
+       $(CC) $(CXFLAGS) $(LDFLAGS) -o raid6check raid6check.o $(CHECK_OBJS)
 
 mdassemble : $(ASSEMBLE_SRCS) $(INCL)
        rm -f $(OBJS)