diff options
| author | Doug Ledford <dledford@redhat.com> | 2008-07-24 13:52:02 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2008-07-24 13:53:29 -0400 |
| commit | d03719e6aa3fddded35e0ede3c6f74a499d193ec (patch) | |
| tree | 27dfeacf8b2991e756d132c1b1633a4a5a0cd573 | |
| parent | 5948e9156878ccbacdbd0b9ce68e2c38c41fafb1 (diff) | |
| download | mdadm-d03719e6aa3fddded35e0ede3c6f74a499d193ec.tar.gz mdadm-d03719e6aa3fddded35e0ede3c6f74a499d193ec.tar.xz mdadm-d03719e6aa3fddded35e0ede3c6f74a499d193ec.zip | |
Apply mdadm-2.6.1-build.patch from F-9 dist-cvs repo
Signed-off-by: Doug Ledford <dledford@redhat.com>
| -rw-r--r-- | Makefile | 29 |
1 files changed, 16 insertions, 13 deletions
@@ -104,13 +104,15 @@ mdadm.static : $(OBJS) $(STATICOBJS) $(CC) $(CFLAGS) $(LDFLAGS) -static -o mdadm.static $(OBJS) $(STATICOBJS) mdadm.tcc : $(SRCS) mdadm.h + rm -f $(OBJS) $(STATICOBJS) $(TCC) -o mdadm.tcc $(SRCS) dadm.uclibc : $(SRCS) mdadm.h + rm -f $(OBJS) $(STATICOBJS) $(UCLIBC_GCC) -DUCLIBC -DHAVE_STDINT_H -o mdadm.uclibc $(SRCS) $(STATICSRC) mdadm.klibc : $(SRCS) mdadm.h - rm -f $(OBJS) + rm -f $(OBJS) $(STATICOBJS) 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) mdadm.Os : $(SRCS) mdadm.h @@ -122,12 +124,12 @@ mdadm.O2 : $(SRCS) mdadm.h test_stripe : restripe.c mdadm.h $(CC) $(CXFLAGS) $(LDFLAGS) -o test_stripe -DMAIN restripe.c -mdassemble : $(ASSEMBLE_SRCS) mdadm.h - rm -f $(OBJS) - $(DIET_GCC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS) $(STATICSRC) +mdassemble : $(ASSEMBLE_SRCS) $(STATICSRC) mdadm.h + rm -f $(OBJS) $(STATICOBJS) + $(CC) $(ASSEMBLE_FLAGS) $(LDFLAGS) -DHAVE_STDINT_H -o mdassemble $(ASSEMBLE_SRCS) $(STATICSRC) -mdassemble.static : $(ASSEMBLE_SRCS) mdadm.h - rm -f $(OBJS) +mdassemble.static : $(ASSEMBLE_SRCS) $(STATICSRC) mdadm.h + rm -f $(OBJS) $(STATICOBJS) $(CC) $(ASSEMBLE_FLAGS) $(LDFLAGS) -static -DHAVE_STDINT_H -o mdassemble.static $(ASSEMBLE_SRCS) $(STATICSRC) mdassemble.auto : $(ASSEMBLE_SRCS) mdadm.h $(ASSEMBLE_AUTO_SRCS) @@ -135,8 +137,8 @@ mdassemble.auto : $(ASSEMBLE_SRCS) mdadm.h $(ASSEMBLE_AUTO_SRCS) $(MAKE) MDASSEMBLE_AUTO=1 mdassemble.static mv mdassemble.static mdassemble.auto -mdassemble.uclibc : $(ASSEMBLE_SRCS) mdadm.h - rm -f $(OJS) +mdassemble.uclibc : $(ASSEMBLE_SRCS) $(STATICSRC) mdadm.h + rm -f $(OJS) $(STATICOBJS) $(UCLIBC_GCC) $(ASSEMBLE_FLAGS) -DUCLIBC -DHAVE_STDINT_H -static -o mdassemble.uclibc $(ASSEMBLE_SRCS) $(STATICSRC) # This doesn't work @@ -161,8 +163,9 @@ $(OBJS) : mdadm.h bitmap.h sha1.o : sha1.c sha1.h md5.h $(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c -install : mdadm mdadm.static mdassemble.static install-man +install : mdadm mdadm.static mdassemble mdassemble.static install-man $(INSTALL) -D -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm + $(INSTALL) -D -m 755 mdassemble $(DESTDIR)$(BINDIR)/mdassemble $(INSTALL) -D -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm.static $(INSTALL) -D -m 755 mdassemble.static $(DESTDIR)$(BINDIR)/mdassemble.static @@ -179,10 +182,10 @@ install-klibc : mdadm.klibc install-man $(INSTALL) -D -m 755 mdadm.klibc $(DESTDIR)$(BINDIR)/mdadm install-man: mdadm.8 mdassemble.8 md.4 mdadm.conf.5 - $(INSTALL) -D -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8 - $(INSTALL) -D -m 644 mdassemble.8 $(DESTDIR)$(MAN8DIR)/mdassemble.8 - $(INSTALL) -D -m 644 md.4 $(DESTDIR)$(MAN4DIR)/md.4 - $(INSTALL) -D -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 + $(INSTALL) -Dp -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8 + $(INSTALL) -Dp -m 644 mdassemble.8 $(DESTDIR)$(MAN8DIR)/mdassemble.8 + $(INSTALL) -Dp -m 644 md.4 $(DESTDIR)$(MAN4DIR)/md.4 + $(INSTALL) -Dp -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 uninstall: rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 md.4 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm |