diff options
| author | Neil Brown <neilb@suse.de> | 2008-06-19 16:38:37 +1000 |
|---|---|---|
| committer | Neil Brown <neilb@suse.de> | 2008-06-19 16:38:37 +1000 |
| commit | 370ac380fda9fb0d813f210ed2b342cfbde07cf0 (patch) | |
| tree | 79680600bef18504fc82362fe3134d2b316f44ab /Makefile | |
| parent | 94f8ae072f885eac63fa45a3f8573a2c17a5bf7b (diff) | |
| parent | 60b435db5a7b085ad1204168879037bf14ebd6d1 (diff) | |
| download | mdadm-370ac380fda9fb0d813f210ed2b342cfbde07cf0.tar.gz mdadm-370ac380fda9fb0d813f210ed2b342cfbde07cf0.tar.xz mdadm-370ac380fda9fb0d813f210ed2b342cfbde07cf0.zip | |
Merge branch 'master' into devel-3.0
Conflicts:
Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -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.. @@ -138,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) @@ -194,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 |