From: Neil Brown <neilb@suse.de>
Date: Thu, 19 Jun 2008 06:38:37 +0000 (+1000)
Subject: Merge branch 'master' into devel-3.0
X-Git-Tag: mdadm-3.0-devel1~160
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=370ac380fda9fb0d813f210ed2b342cfbde07cf0;p=thirdparty%2Fmdadm.git

Merge branch 'master' into devel-3.0

Conflicts:

	Makefile
---

370ac380fda9fb0d813f210ed2b342cfbde07cf0
diff --cc Makefile
index 68b38918,2b3c84cb..409df210
--- a/Makefile
+++ b/Makefile
@@@ -86,17 -81,18 +86,18 @@@ STATICSRC = pwgr.
  STATICOBJS = pwgr.o
  
  ASSEMBLE_SRCS := mdassemble.c Assemble.c Manage.c config.c dlink.c util.c \
 -	super0.c super1.c sha1.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 mdadm.man md.man mdadm.conf.man
 +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..
@@@ -191,10 -188,10 +197,11 @@@ test: mdadm test_stripe swap_supe
  	@echo "Please run 'sh ./test' as root"
  
  clean : 
 -	rm -f mdadm $(OBJS) $(STATICOBJS) core *.man mdadm.tcc mdadm.uclibc mdadm.static *.orig *.porig *.rej *.alt \
 +	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