Detail: Respect code lines are 80 character wide

[thirdparty/mdadm.git] / Makefile

diff --git a/Makefile b/Makefile
index 5ff6cc09f33ca11312891e9d85da57915293cf1d..685069612617bd405c30efbd5d6658005e17410b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,7 @@
 
 # define "CXFLAGS" to give extra flags to CC.
 # e.g.  make CXFLAGS=-O to optimise
+CXFLAGS ?=-O2
 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
@@ -158,18 +159,6 @@ MON_SRCS = $(patsubst %.o,%.c,$(MON_OBJS))
 STATICSRC = pwgr.c
 STATICOBJS = pwgr.o
 
-ASSEMBLE_SRCS := mdassemble.c Assemble.c Manage.c config.c policy.c dlink.c util.c \
-       maps.c lib.c xmalloc.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 super-mbr.c super-gpt.c mapfile.c \
-       crc32c.c
-ASSEMBLE_AUTO_SRCS := mdopen.c
-ASSEMBLE_FLAGS:= $(CFLAGS) -DMDASSEMBLE
-ifdef MDASSEMBLE_AUTO
-ASSEMBLE_SRCS += $(ASSEMBLE_AUTO_SRCS)
-ASSEMBLE_FLAGS += -DMDASSEMBLE_AUTO
-endif
-
 all : mdadm mdmon
 man : mdadm.man md.man mdadm.conf.man mdmon.man raid6check.man
 
@@ -181,12 +170,10 @@ check_rundir:
        fi
 
 everything: all mdadm.static swap_super test_stripe raid6check \
-       mdassemble mdassemble.auto mdassemble.static mdassemble.man \
        mdadm.Os mdadm.O2 man
 everything-test: all mdadm.static swap_super test_stripe \
-       mdassemble.auto mdassemble.static mdassemble.man \
        mdadm.Os mdadm.O2 man
-# mdadm.uclibc and mdassemble.uclibc don't work on x86-64
+# mdadm.uclibc doesn't work on x86-64
 # mdadm.tcc doesn't work..
 
 mdadm : $(OBJS) | check_rundir
@@ -222,31 +209,6 @@ test_stripe : restripe.c xmalloc.o mdadm.h
 raid6check : raid6check.o mdadm.h $(CHECK_OBJS)
        $(CC) $(CXFLAGS) $(LDFLAGS) -o raid6check raid6check.o $(CHECK_OBJS)
 
-mdassemble : $(ASSEMBLE_SRCS) $(INCL)
-       $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS)  $(STATICSRC)
-
-mdassemble.diet : $(ASSEMBLE_SRCS) $(INCL)
-       rm -f $(OBJS)
-       $(DIET_GCC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS)  $(STATICSRC)
-
-mdassemble.static : $(ASSEMBLE_SRCS) $(INCL)
-       rm -f $(OBJS)
-       $(CC) $(LDFLAGS) $(CPPFLAGS) $(ASSEMBLE_FLAGS) -static -DHAVE_STDINT_H -o mdassemble.static $(ASSEMBLE_SRCS) $(STATICSRC)
-
-mdassemble.auto : $(ASSEMBLE_SRCS) $(INCL) $(ASSEMBLE_AUTO_SRCS)
-       rm -f mdassemble.static
-       $(MAKE) MDASSEMBLE_AUTO=1 mdassemble.static
-       mv mdassemble.static mdassemble.auto
-
-mdassemble.uclibc : $(ASSEMBLE_SRCS) $(INCL)
-       rm -f $(OJS)
-       $(UCLIBC_GCC) $(ASSEMBLE_FLAGS) -DUCLIBC -DHAVE_STDINT_H -static -o mdassemble.uclibc $(ASSEMBLE_SRCS) $(STATICSRC)
-
-# This doesn't work
-mdassemble.klibc : $(ASSEMBLE_SRCS) $(INCL)
-       rm -f $(OBJS)
-       $(KLIBC_GCC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS)
-
 mdadm.8 : mdadm.8.in
        sed -e 's/{DEFAULT_METADATA}/$(DEFAULT_METADATA)/g' \
        -e 's,{MAP_PATH},$(MAP_PATH),g'  mdadm.8.in > mdadm.8
@@ -263,9 +225,6 @@ md.man : md.4
 mdadm.conf.man : mdadm.conf.5
        man -l mdadm.conf.5 > mdadm.conf.man
 
-mdassemble.man : mdassemble.8
-       man -l mdassemble.8 > mdassemble.man
-
 raid6check.man : raid6check.8
        man -l raid6check.8 > raid6check.man
 
@@ -330,9 +289,7 @@ test: mdadm mdmon test_stripe swap_super raid6check
 clean :
        rm -f mdadm mdmon $(OBJS) $(MON_OBJS) $(STATICOBJS) core *.man \
        mdadm.tcc mdadm.uclibc mdadm.static *.orig *.porig *.rej *.alt .merge_file_* \
-       mdadm.Os mdadm.O2 mdmon.O2 \
-       mdassemble mdassemble.static mdassemble.auto mdassemble.uclibc \
-       mdassemble.klibc swap_super \
+       mdadm.Os mdadm.O2 mdmon.O2 swap_super \
        init.cpio.gz mdadm.uclibc.static test_stripe raid6check raid6check.o mdmon \
        mdadm.8