Don't assume that mdmon is in the current directory.

[thirdparty/mdadm.git] / Makefile

diff --git a/Makefile b/Makefile
index b2087d0c693e5bb27a69a050428a732bbbf8ae30..409df2101350fe1a15a30f220a1b0039b901fd76 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,7 @@ SRCS =  mdadm.c config.c mdstat.c  ReadMe.c util.c Manage.c Assemble.c Build.c \
 
 MON_OBJS = mdmon.o monitor.o managemon.o util.o mdstat.o sysfs.o config.o \
        Kill.o sg_io.o dlink.o ReadMe.o super0.o super1.o super-intel.o \
-       super-ddf.o sha1.o crc32.o
+       super-ddf.o sha1.o crc32.o msg.o
 
 
 STATICSRC = pwgr.c
@@ -87,16 +87,17 @@ STATICOBJS = pwgr.o
 
 ASSEMBLE_SRCS := mdassemble.c Assemble.c Manage.c config.c dlink.c util.c \
        super0.c super1.c super-ddf.c super-intel.c sha1.c crc32.c sg_io.c
+ASSEMBLE_AUTO_SRCS := mdopen.c mdstat.c sysfs.c
 ASSEMBLE_FLAGS:= $(CFLAGS) -DMDASSEMBLE
 ifdef MDASSEMBLE_AUTO
-ASSEMBLE_SRCS += mdopen.c mdstat.c
+ASSEMBLE_SRCS += $(ASSEMBLE_AUTO_SRCS)
 ASSEMBLE_FLAGS += -DMDASSEMBLE_AUTO
 endif
 
 all : mdadm mdmon mdadm.man md.man mdadm.conf.man
 
 everything: all mdadm.static swap_super test_stripe \
-       mdassemble mdassemble.static mdassemble.man \
+       mdassemble mdassemble.auto mdassemble.static mdassemble.man \
        mdadm.Os mdadm.O2
 # mdadm.uclibc and mdassemble.uclibc don't work on x86-64
 # mdadm.tcc doesn't work..
@@ -125,6 +126,7 @@ mdadm.O2 : $(SRCS) mdadm.h
 
 mdmon : $(MON_OBJS)
        $(CC) $(LDFLAGS) -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
@@ -137,6 +139,11 @@ mdassemble.static : $(ASSEMBLE_SRCS) mdadm.h
        rm -f $(OBJS)
        $(CC) $(LDFLAGS) $(ASSEMBLE_FLAGS) -static -DHAVE_STDINT_H -o mdassemble.static $(ASSEMBLE_SRCS) $(STATICSRC)
 
+mdassemble.auto : $(ASSEMBLE_SRCS) mdadm.h $(ASSEMBLE_AUTO_SRCS)
+       rm -f mdassemble.static
+       $(MAKE) MDASSEMBLE_AUTO=1 mdassemble.static
+       mv mdassemble.static mdassemble.auto
+
 mdassemble.uclibc : $(ASSEMBLE_SRCS) mdadm.h
        rm -f $(OJS)
        $(UCLIBC_GCC) $(ASSEMBLE_FLAGS) -DUCLIBC -DHAVE_STDINT_H -static -o mdassemble.uclibc $(ASSEMBLE_SRCS) $(STATICSRC)
@@ -193,7 +200,8 @@ clean :
        rm -f mdadm mdmon $(OBJS) $(MON_OBJS) $(STATICOBJS) core *.man \
        mdadm.tcc mdadm.uclibc mdadm.static *.orig *.porig *.rej *.alt \
        mdadm.Os mdadm.O2 \
-       mdassemble mdassemble.static mdassemble.uclibc mdassemble.klibc swap_super \
+       mdassemble mdassemble.static mdassemble.auto mdassemble.uclibc \
+       mdassemble.klibc swap_super \
        init.cpio.gz mdadm.uclibc.static test_stripe
 
 dist : clean