summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Brown <neilb@suse.de>2008-05-19 12:07:47 +1000
committerNeil Brown <neilb@suse.de>2008-05-19 12:07:47 +1000
commit7702a58b90c08fc831601090ea37b863b825d765 (patch)
tree64e3dad8b0323ce3a1231448ce4e2424d219324d
parent7815fbfef24d6b93946932aaccadbbf7b03cad93 (diff)
downloadmdadm-7702a58b90c08fc831601090ea37b863b825d765.tar.gz
mdadm-7702a58b90c08fc831601090ea37b863b825d765.tar.xz
mdadm-7702a58b90c08fc831601090ea37b863b825d765.zip
Include sysfs.c in mdassemble.auto
and tidy up Makefile a bit.
-rw-r--r--Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index f59498a..2b3c84c 100644
--- a/Makefile
+++ b/Makefile
@@ -80,10 +80,12 @@ SRCS = mdadm.c config.c mdstat.c ReadMe.c util.c Manage.c Assemble.c Build.c \
STATICSRC = pwgr.c
STATICOBJS = pwgr.o
-ASSEMBLE_SRCS := mdassemble.c Assemble.c Manage.c config.c dlink.c util.c super0.c super1.c sha1.c
+ASSEMBLE_SRCS := mdassemble.c Assemble.c Manage.c config.c dlink.c util.c \
+ super0.c super1.c sha1.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
@@ -128,7 +130,7 @@ 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 mdopen.c mdstat.c
+mdassemble.auto : $(ASSEMBLE_SRCS) mdadm.h $(ASSEMBLE_AUTO_SRCS)
rm -f mdassemble.static
$(MAKE) MDASSEMBLE_AUTO=1 mdassemble.static
mv mdassemble.static mdassemble.auto