X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=Makefile;h=94a55d935ac695a97eae1adc7d36a312e7f3ae44;hp=68b3891870fe601c4ed283f420e85852fdd3a2b9;hb=8844e291492b82f4bae6129673fb383a309514c0;hpb=b109d92863bfa319d140b305132ca41bfb8d1194 diff --git a/Makefile b/Makefile index 68b38918..94a55d93 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,10 @@ # e.g. make CXFLAGS=-O to optimise TCC = tcc UCLIBC_GCC = $(shell for nm in i386-uclibc-linux-gcc i386-uclibc-gcc; do which $$nm > /dev/null && { echo $$nm ; exit; } ; done; echo false No uclibc found ) -DIET_GCC = diet gcc +#DIET_GCC = diet gcc +# sorry, but diet-libc doesn't know about posix_memalign, +# so we cannot use it any more. +DIET_GCC = gcc -DHAVE_STDINT_H KLIBC=/home/src/klibc/klibc-0.77 @@ -40,6 +43,9 @@ KLIBC_GCC = gcc -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIB CC = $(CROSS_COMPILE)gcc CXFLAGS = -ggdb CWFLAGS = -Wall -Werror -Wstrict-prototypes +ifdef WARN_UNUSED +CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O +endif ifdef DEBIAN CPPFLAGS= -DDEBIAN @@ -70,33 +76,42 @@ 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 + 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 + 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 += 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 +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.. @@ -110,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) @@ -138,6 +150,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) @@ -159,13 +176,15 @@ mdadm.conf.man : mdadm.conf.5 mdassemble.man : mdassemble.8 nroff -man mdassemble.8 > mdassemble.man -$(OBJS) : mdadm.h bitmap.h +$(OBJS) : mdadm.h mdmon.h bitmap.h +$(MON_OBJS) : mdadm.h mdmon.h bitmap.h sha1.o : sha1.c sha1.h md5.h $(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c -install : mdadm install-man +install : mdadm mdmon install-man install-udev $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm + $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon install-static : mdadm.static install-man $(INSTALL) -D $(STRIP) -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm @@ -184,6 +203,9 @@ install-man: mdadm.8 md.4 mdadm.conf.5 $(INSTALL) -D -m 644 md.4 $(DESTDIR)$(MAN4DIR)/md.4 $(INSTALL) -D -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 +install-udev: udev-md-raid.rules + $(INSTALL) -D -m 644 udev-md-raid.rules $(DESTDIR)/lib/udev/rules.d/64-md-raid.rules + uninstall: rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 md.4 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm @@ -194,14 +216,21 @@ 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 \ - init.cpio.gz mdadm.uclibc.static test_stripe + mdassemble mdassemble.static mdassemble.auto mdassemble.uclibc \ + mdassemble.klibc swap_super \ + init.cpio.gz mdadm.uclibc.static test_stripe mdmon dist : clean ./makedist -testdist : everything clean +testdist : everything-test clean ./makedist test TAGS : etags *.h *.c + +DISTRO_MAKEFILE := $(wildcard distropkg/Makefile) +ifdef DISTRO_MAKEFILE +include $(DISTRO_MAKEFILE) +endif +