diff options
| author | Doug Ledford <dledford@redhat.com> | 2008-07-24 13:20:16 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2008-07-24 13:20:16 -0400 |
| commit | 87a63d2bf81bcb004490879099cf86edc864d5c5 (patch) | |
| tree | 3faf66bbfc2e9c8a8e2691b551b87d6b302e80cc | |
| parent | 22c3e5377e3932f3ad29fb8f1e9fe14cd5a86eda (diff) | |
| download | mdadm-87a63d2bf81bcb004490879099cf86edc864d5c5.tar.gz mdadm-87a63d2bf81bcb004490879099cf86edc864d5c5.tar.xz mdadm-87a63d2bf81bcb004490879099cf86edc864d5c5.zip | |
Apply mdadm-2.6.1-build.patch from F-8 dist-cvs repo
Signed-off-by: Doug Ledford <dledford@redhat.com>
| -rw-r--r-- | Makefile | 24 |
1 files changed, 13 insertions, 11 deletions
@@ -102,13 +102,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 @@ -121,15 +123,15 @@ 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) + rm -f $(OBJS) $(STATICOBJS) + $(CC) $(ASSEMBLE_FLAGS) $(LDFLAGS) -DHAVE_STDINT_H -o mdassemble.static $(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.uclibc : $(ASSEMBLE_SRCS) mdadm.h - rm -f $(OJS) +mdassemble.uclibc : $(ASSEMBLE_SRCS) $(STATICSRC) mdadm.h + rm -f $(OBJS) $(STATICOBJS) $(UCLIBC_GCC) $(ASSEMBLE_FLAGS) -DUCLIBC -DHAVE_STDINT_H -static -o mdassemble.uclibc $(ASSEMBLE_SRCS) $(STATICSRC) # This doesn't work @@ -172,10 +174,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 |