Merge branch 'master' in devel-3.0

[thirdparty/mdadm.git] / Makefile

diff --git a/Makefile b/Makefile
index afbd7120e2c8a2f4d8adc90fdbff09c5dd37799a..94a55d935ac695a97eae1adc7d36a312e7f3ae44 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -76,24 +76,29 @@ OBJS =  mdadm.o config.o mdstat.o  ReadMe.o util.o Manage.o Assemble.o Build.o \
        Create.o Detail.o Examine.o Grow.o Monitor.o dlink.o Kill.o Query.o \
        Incremental.o \
        mdopen.o super0.o super1.o super-ddf.o super-intel.o bitmap.o \
-       restripe.o sysfs.o sha1.o mapfile.o crc32.o sg_io.o msg.o
+       restripe.o sysfs.o sha1.o mapfile.o crc32.o sg_io.o msg.o \
+       platform-intel.o probe_roms.o
+
 SRCS =  mdadm.c config.c mdstat.c  ReadMe.c util.c Manage.c Assemble.c Build.c \
        Create.c Detail.c Examine.c Grow.c Monitor.c dlink.c Kill.c Query.c \
        Incremental.c \
        mdopen.c super0.c super1.c super-ddf.c super-intel.c bitmap.c \
-       restripe.c sysfs.c sha1.c mapfile.c crc32.c sg_io.c msg.c
+       restripe.c sysfs.c sha1.c mapfile.c crc32.c sg_io.c msg.c \
+       platform-intel.c probe_roms.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 msg.o Monitor.o bitmap.o
+       super-ddf.o sha1.o crc32.o msg.o Monitor.o bitmap.o \
+       platform-intel.o probe_roms.o
 
 
 STATICSRC = pwgr.c
 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 mdstat.c
-ASSEMBLE_AUTO_SRCS := mdopen.c sysfs.c
+       super0.c super1.c super-ddf.c super-intel.c sha1.c crc32.c sg_io.c mdstat.c \
+       platform-intel.c probe_roms.c sysfs.c
+ASSEMBLE_AUTO_SRCS := mdopen.c
 ASSEMBLE_FLAGS:= $(CFLAGS) -DMDASSEMBLE
 ifdef MDASSEMBLE_AUTO
 ASSEMBLE_SRCS += $(ASSEMBLE_AUTO_SRCS)
@@ -105,6 +110,9 @@ all : mdadm mdmon mdadm.man md.man mdadm.conf.man
 everything: all mdadm.static swap_super test_stripe \
        mdassemble mdassemble.auto mdassemble.static mdassemble.man \
        mdadm.Os mdadm.O2
+everything-test: all mdadm.static swap_super test_stripe \
+       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..
 
@@ -117,9 +125,6 @@ mdadm.static : $(OBJS) $(STATICOBJS)
 mdadm.tcc : $(SRCS) mdadm.h
        $(TCC) -o mdadm.tcc $(SRCS)
 
-dadm.uclibc : $(SRCS) mdadm.h
-       $(UCLIBC_GCC) -DUCLIBC -DHAVE_STDINT_H -o mdadm.uclibc $(SRCS) $(STATICSRC)
-
 mdadm.klibc : $(SRCS) mdadm.h
        rm -f $(OBJS) 
        gcc -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIBC)/linux/include -I$(KLIBC)/klibc/arch/i386/include -I$(KLIBC)/klibc/include/bits32 $(CFLAGS) $(SRCS)
@@ -213,12 +218,12 @@ clean :
        mdadm.Os mdadm.O2 \
        mdassemble mdassemble.static mdassemble.auto mdassemble.uclibc \
        mdassemble.klibc swap_super \
-       init.cpio.gz mdadm.uclibc.static test_stripe
+       init.cpio.gz mdadm.uclibc.static test_stripe mdmon
 
 dist : clean
        ./makedist
 
-testdist : everything clean
+testdist : everything-test clean
        ./makedist test
 
 TAGS :