btrfs-progs: fi defrag: clean up duplicate code if find errors
[platform/upstream/btrfs-progs.git] / Makefile
index da7438e..6369e8f 100644 (file)
--- a/Makefile
+++ b/Makefile
-CC = gcc
-LN = ln
-AR = ar
-AM_CFLAGS = -Wall -D_FILE_OFFSET_BITS=64 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -DBTRFS_FLAT_INCLUDES -fPIC
-CFLAGS = -g -O1
-objects = ctree.o disk-io.o radix-tree.o extent-tree.o print-tree.o \
+#
+# Basic build targets:
+#   all                all main tools and the shared library
+#   static      build static bnaries, requires static version of the libraries
+#   test        run the full testsuite
+#   install     install to default location (/usr/local)
+#   clean       clean built binaries (not the documentation)
+#   clean-all   clean as above, clean docs and generated files
+#
+# Tuning by variables (environment or make arguments):
+#   V=1            verbose, print command lines (default: quiet)
+#   C=1            run checker before compilation (default checker: sparse)
+#   D=1            debugging build, turn off optimizations
+#   D=dflags       dtto, turn on additional debugging features:
+#                  verbose - print file:line along with error/warning messages
+#                  trace   - print trace before the error/warning messages
+#                  abort   - call abort() on first error (dumps core)
+#                  all     - shortcut for all of the above
+#                  asan    - enable address sanitizer compiler feature
+#                  tsan    - enable thread sanitizer compiler feature
+#                  ubsan   - undefined behaviour sanitizer compiler feature
+#                  bcheck  - extended build checks
+#   W=123          build with warnings (default: off)
+#   DEBUG_CFLAGS   additional compiler flags for debugging build
+#   EXTRA_CFLAGS   additional compiler flags
+#   EXTRA_LDFLAGS  additional linker flags
+#
+# Testing-specific options (see also tests/README.md):
+#   TEST=GLOB      run test(s) from directories matching GLOB
+#   TEST_LOG=tty   print name of a command run via the execution helpers
+#   TEST_LOG=dump  dump testing log file when a test fails
+#
+# Static checkers:
+#   CHECKER        static checker binary to be called (default: sparse)
+#   CHECKER_FLAGS  flags to pass to CHECKER, can override CFLAGS
+#
+
+# Export all variables to sub-makes by default
+export
+
+-include Makefile.inc
+ifneq ($(MAKEFILE_INC_INCLUDED),yes)
+$(error Makefile.inc not generated, please configure first)
+endif
+
+TAGS_CMD := ctags
+CSCOPE_CMD := cscope -u -b -c -q
+
+include Makefile.extrawarn
+
+EXTRA_CFLAGS :=
+EXTRA_LDFLAGS :=
+
+DEBUG_CFLAGS_DEFAULT = -O0 -U_FORTIFY_SOURCE -ggdb3
+DEBUG_CFLAGS_INTERNAL =
+DEBUG_CFLAGS :=
+
+DEBUG_LDFLAGS_DEFAULT =
+DEBUG_LDFLAGS_INTERNAL =
+DEBUG_LDFLAGS :=
+
+ABSTOPDIR = $(shell pwd)
+TOPDIR := .
+
+# Common build flags
+CSTD = -std=gnu90
+CFLAGS = $(SUBST_CFLAGS) \
+        $(CSTD) \
+        -include config.h \
+        -DBTRFS_FLAT_INCLUDES \
+        -D_XOPEN_SOURCE=700  \
+        -fno-strict-aliasing \
+        -fPIC \
+        -I$(TOPDIR) \
+        -I$(TOPDIR)/kernel-lib \
+        $(EXTRAWARN_CFLAGS) \
+        $(DEBUG_CFLAGS_INTERNAL) \
+        $(EXTRA_CFLAGS)
+
+LDFLAGS = $(SUBST_LDFLAGS) \
+         -rdynamic -L$(TOPDIR) \
+         $(DEBUG_LDFLAGS_INTERNAL) \
+         $(EXTRA_LDFLAGS)
+
+LIBS = $(LIBS_BASE)
+LIBBTRFS_LIBS = $(LIBS_BASE)
+
+# Static compilation flags
+STATIC_CFLAGS = $(CFLAGS) -ffunction-sections -fdata-sections
+STATIC_LDFLAGS = -static -Wl,--gc-sections
+STATIC_LIBS = $(STATIC_LIBS_BASE)
+
+# don't use FORTIFY with sparse because glibc with FORTIFY can
+# generate so many sparse errors that sparse stops parsing,
+# which masks real errors that we want to see.
+# Note: additional flags might get added per-target later
+CHECKER := sparse
+check_defs := .cc-defines.h
+CHECKER_FLAGS := -include $(check_defs) -D__CHECKER__ \
+       -D__CHECK_ENDIAN__ -Wbitwise -Wuninitialized -Wshadow -Wundef \
+       -U_FORTIFY_SOURCE -Wdeclaration-after-statement -Wdefault-bitfield-sign
+
+objects = ctree.o disk-io.o kernel-lib/radix-tree.o extent-tree.o print-tree.o \
          root-tree.o dir-item.o file-item.o inode-item.o inode-map.o \
          extent-cache.o extent_io.o volumes.o utils.o repair.o \
-         qgroup.o raid6.o free-space-cache.o
+         qgroup.o free-space-cache.o kernel-lib/list_sort.o props.o \
+         kernel-shared/ulist.o qgroup-verify.o backref.o string-table.o task-utils.o \
+         inode.o file.o find-root.o free-space-tree.o help.o send-dump.o \
+         fsfeatures.o kernel-lib/tables.o kernel-lib/raid56.o transaction.o
 cmds_objects = cmds-subvolume.o cmds-filesystem.o cmds-device.o cmds-scrub.o \
               cmds-inspect.o cmds-balance.o cmds-send.o cmds-receive.o \
               cmds-quota.o cmds-qgroup.o cmds-replace.o cmds-check.o \
-              cmds-restore.o
-libbtrfs_objects = send-stream.o send-utils.o rbtree.o btrfs-list.o crc32c.o
-libbtrfs_headers = send-stream.h send-utils.h send.h rbtree.h btrfs-list.h \
-              crc32c.h list.h kerncompat.h radix-tree.h extent-cache.h \
-              extent_io.h ioctl.h ctree.h
-
-CHECKFLAGS= -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise \
-           -Wuninitialized -Wshadow -Wundef
-DEPFLAGS = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@
-
-INSTALL = install
-prefix ?= /usr/local
-bindir = $(prefix)/bin
-lib_LIBS = -luuid -lblkid -lm -lz -llzo2 -L.
-libdir ?= $(prefix)/lib
-incdir = $(prefix)/include/btrfs
-LIBS = $(lib_LIBS) $(libs_static)
+              cmds-restore.o cmds-rescue.o chunk-recover.o super-recover.o \
+              cmds-property.o cmds-fi-usage.o cmds-inspect-dump-tree.o \
+              cmds-inspect-dump-super.o cmds-inspect-tree-stats.o cmds-fi-du.o \
+              mkfs/common.o
+libbtrfs_objects = send-stream.o send-utils.o kernel-lib/rbtree.o btrfs-list.o \
+                  kernel-lib/crc32c.o messages.o \
+                  uuid-tree.o utils-lib.o rbtree-utils.o
+libbtrfs_headers = send-stream.h send-utils.h send.h kernel-lib/rbtree.h btrfs-list.h \
+              kernel-lib/crc32c.h kernel-lib/list.h kerncompat.h \
+              kernel-lib/radix-tree.h kernel-lib/sizes.h kernel-lib/raid56.h \
+              extent-cache.h extent_io.h ioctl.h ctree.h btrfsck.h version.h
+convert_objects = convert/main.o convert/common.o convert/source-fs.o \
+                 convert/source-ext2.o convert/source-reiserfs.o
+mkfs_objects = mkfs/main.o mkfs/common.o
+image_objects = image/main.o image/sanitize.o
+all_objects = $(objects) $(cmds_objects) $(libbtrfs_objects) $(convert_objects) \
+             $(mkfs_objects) $(image_objects)
+
+TESTS = fsck-tests.sh convert-tests.sh
+
+udev_rules = 64-btrfs-dm.rules
 
 ifeq ("$(origin V)", "command line")
   BUILD_VERBOSE = $(V)
@@ -41,27 +145,108 @@ else
   Q = @
 endif
 
+ifeq ("$(origin D)", "command line")
+  DEBUG_CFLAGS_INTERNAL = $(DEBUG_CFLAGS_DEFAULT) $(DEBUG_CFLAGS)
+  DEBUG_LDFLAGS_INTERNAL = $(DEBUG_LDFLAGS_DEFAULT) $(DEBUG_LDFLAGS)
+endif
+
+ifneq (,$(findstring verbose,$(D)))
+  DEBUG_CFLAGS_INTERNAL += -DDEBUG_VERBOSE_ERROR=1
+endif
+
+ifneq (,$(findstring trace,$(D)))
+  DEBUG_CFLAGS_INTERNAL += -DDEBUG_TRACE_ON_ERROR=1
+endif
+
+ifneq (,$(findstring abort,$(D)))
+  DEBUG_CFLAGS_INTERNAL += -DDEBUG_ABORT_ON_ERROR=1
+endif
+
+ifneq (,$(findstring all,$(D)))
+  DEBUG_CFLAGS_INTERNAL += -DDEBUG_VERBOSE_ERROR=1
+  DEBUG_CFLAGS_INTERNAL += -DDEBUG_TRACE_ON_ERROR=1
+  DEBUG_CFLAGS_INTERNAL += -DDEBUG_ABORT_ON_ERROR=1
+endif
+
+ifneq (,$(findstring asan,$(D)))
+  DEBUG_CFLAGS_INTERNAL += -fsanitize=address
+  DEBUG_LDFLAGS_INTERNAL += -fsanitize=address -lasan
+endif
+
+ifneq (,$(findstring tsan,$(D)))
+  DEBUG_CFLAGS_INTERNAL += -fsanitize=thread -fPIC
+  DEBUG_LDFLAGS_INTERNAL += -fsanitize=thread -ltsan -pie
+endif
+
+ifneq (,$(findstring ubsan,$(D)))
+  DEBUG_CFLAGS_INTERNAL += -fsanitize=undefined
+  DEBUG_LDFLAGS_INTERNAL += -fsanitize=undefined -lubsan
+endif
+
+ifneq (,$(findstring bcheck,$(D)))
+  DEBUG_CFLAGS_INTERNAL += -DDEBUG_BUILD_CHECKS
+endif
+
 MAKEOPTS = --no-print-directory Q=$(Q)
 
-progs = mkfs.btrfs btrfs-debug-tree btrfsck \
-       btrfs btrfs-map-logical btrfs-image btrfs-zero-log btrfs-convert \
-       btrfs-find-root btrfstune btrfs-show-super
+# build all by default
+progs = $(progs_install) btrfsck btrfs-corrupt-block
+
+# install only selected
+progs_install = btrfs mkfs.btrfs btrfs-debug-tree \
+       btrfs-map-logical btrfs-image btrfs-zero-log \
+       btrfs-find-root btrfstune \
+       btrfs-select-super
+
+# other tools, not built by default
+progs_extra = btrfs-fragments btrfs-calc-size btrfs-show-super
+
+progs_static = $(foreach p,$(progs),$(p).static)
+
+ifneq ($(DISABLE_BTRFSCONVERT),1)
+progs_install += btrfs-convert
+endif
 
 # external libs required by various binaries; for btrfs-foo,
 # specify btrfs_foo_libs = <list of libs>; see $($(subst...)) rules below
-btrfs_convert_libs = -lext2fs -lcom_err
-btrfs_image_libs = -lpthread
-btrfs_fragment_libs = -lgd -lpng -ljpeg -lfreetype
+btrfs_convert_cflags = -DBTRFSCONVERT_EXT2=$(BTRFSCONVERT_EXT2)
+btrfs_convert_cflags += -DBTRFSCONVERT_REISERFS=$(BTRFSCONVERT_REISERFS)
+btrfs_fragments_libs = -lgd -lpng -ljpeg -lfreetype
+btrfs_debug_tree_objects = cmds-inspect-dump-tree.o
+btrfs_show_super_objects = cmds-inspect-dump-super.o
+btrfs_calc_size_objects = cmds-inspect-tree-stats.o
+cmds_restore_cflags = -DBTRFSRESTORE_ZSTD=$(BTRFSRESTORE_ZSTD)
+
+CHECKER_FLAGS += $(btrfs_convert_cflags)
+
+# collect values of the variables above
+standalone_deps = $(foreach dep,$(patsubst %,%_objects,$(subst -,_,$(filter btrfs-%, $(progs)))),$($(dep)))
+
+SUBDIRS =
+BUILDDIRS = $(patsubst %,build-%,$(SUBDIRS))
+INSTALLDIRS = $(patsubst %,install-%,$(SUBDIRS))
+CLEANDIRS = $(patsubst %,clean-%,$(SUBDIRS))
+
+ifneq ($(DISABLE_DOCUMENTATION),1)
+BUILDDIRS += build-Documentation
+INSTALLDIRS += install-Documentation
+endif
+
+.PHONY: $(SUBDIRS)
+.PHONY: $(BUILDDIRS)
+.PHONY: $(INSTALLDIRS)
+.PHONY: $(TESTDIRS)
+.PHONY: $(CLEANDIRS)
+.PHONY: all install clean
+.PHONY: FORCE
 
 # Create all the static targets
 static_objects = $(patsubst %.o, %.static.o, $(objects))
 static_cmds_objects = $(patsubst %.o, %.static.o, $(cmds_objects))
 static_libbtrfs_objects = $(patsubst %.o, %.static.o, $(libbtrfs_objects))
-
-# Define static compilation flags
-STATIC_CFLAGS = $(CFLAGS) -ffunction-sections -fdata-sections
-STATIC_LDFLAGS = -static -Wl,--gc-sections
-STATIC_LIBS = $(lib_LIBS) -lpthread
+static_convert_objects = $(patsubst %.o, %.static.o, $(convert_objects))
+static_mkfs_objects = $(patsubst %.o, %.static.o, $(mkfs_objects))
+static_image_objects = $(patsubst %.o, %.static.o, $(image_objects))
 
 libs_shared = libbtrfs.so.0.1
 libs_static = libbtrfs.a
@@ -71,45 +256,117 @@ headers = $(libbtrfs_headers)
 
 # make C=1 to enable sparse
 ifdef C
-       check = sparse $(CHECKFLAGS)
+       # We're trying to use sparse against glibc headers which go wild
+       # trying to use internal compiler macros to test features.  We
+       # copy gcc's and give them to sparse.  But not __SIZE_TYPE__
+       # 'cause sparse defines that one.
+       #
+       dummy := $(shell $(CC) -dM -E -x c - < /dev/null | \
+                       grep -v __SIZE_TYPE__ > $(check_defs))
+       check = $(CHECKER)
+       check_echo = echo
+       CSTD = -std=gnu89
 else
        check = true
+       check_echo = true
 endif
 
+%.o.d: %.c
+       $(Q)$(CC) -MM -MG -MF $@ -MT $(@:.o.d=.o) -MT $(@:.o.d=.static.o) -MT $@ $(CFLAGS) $<
+
+#
+# Pick from per-file variables, btrfs_*_cflags
+#
 .c.o:
-       $(Q)$(check) $<
+       @$(check_echo) "    [SP]     $<"
+       $(Q)$(check) $(CFLAGS) $(CHECKER_FLAGS) $<
        @echo "    [CC]     $@"
-       $(Q)$(CC) $(DEPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c $<
+       $(Q)$(CC) $(CFLAGS) -c $< -o $@ $($(subst -,_,$(@:%.o=%)-cflags)) \
+               $($(subst -,_,btrfs-$(@:%/$(notdir $@)=%)-cflags))
 
 %.static.o: %.c
        @echo "    [CC]     $@"
-       $(Q)$(CC) $(DEPFLAGS) $(AM_CFLAGS) $(STATIC_CFLAGS) -c $< -o $@
+       $(Q)$(CC) $(STATIC_CFLAGS) -c $< -o $@ $($(subst -,_,$(@:%.static.o=%)-cflags)) \
+               $($(subst -,_,btrfs-$(@:%/$(notdir $@)=%)-cflags))
+
+all: $(progs) libbtrfs $(BUILDDIRS)
+$(SUBDIRS): $(BUILDDIRS)
+$(BUILDDIRS):
+       @echo "Making all in $(patsubst build-%,%,$@)"
+       $(Q)$(MAKE) $(MAKEOPTS) -C $(patsubst build-%,%,$@)
+
+test-convert: btrfs btrfs-convert
+       @echo "    [TEST]   convert-tests.sh"
+       $(Q)bash tests/convert-tests.sh
+
+test-check: test-fsck
+test-fsck: btrfs btrfs-image btrfs-corrupt-block mkfs.btrfs btrfstune
+       @echo "    [TEST]   fsck-tests.sh"
+       $(Q)bash tests/fsck-tests.sh
 
-all: version.h $(progs) manpages
+test-misc: btrfs btrfs-image btrfs-corrupt-block mkfs.btrfs btrfstune fssum \
+               btrfs-zero-log btrfs-find-root btrfs-select-super
+       @echo "    [TEST]   misc-tests.sh"
+       $(Q)bash tests/misc-tests.sh
+
+test-mkfs: btrfs mkfs.btrfs
+       @echo "    [TEST]   mkfs-tests.sh"
+       $(Q)bash tests/mkfs-tests.sh
+
+test-fuzz: btrfs
+       @echo "    [TEST]   fuzz-tests.sh"
+       $(Q)bash tests/fuzz-tests.sh
+
+test-cli: btrfs
+       @echo "    [TEST]   cli-tests.sh"
+       $(Q)bash tests/cli-tests.sh
+
+test-clean:
+       @echo "Cleaning tests"
+       $(Q)bash tests/clean-tests.sh
+
+test-inst: all
+       @tmpdest=`mktemp --tmpdir -d btrfs-inst.XXXXXX` && \
+               echo "Test installation to $$tmpdest" && \
+               $(MAKE) $(MAKEOPTS) DESTDIR=$$tmpdest install && \
+               $(RM) -rf -- $$tmpdest
+
+test: test-fsck test-mkfs test-convert test-misc test-fuzz test-cli
 
 #
 # NOTE: For static compiles, you need to have all the required libs
 #      static equivalent available
 #
-static: version.h btrfs.static mkfs.btrfs.static btrfs-find-root.static
+static: $(progs_static)
 
-version.h:
+version.h: version.sh version.h.in configure.ac
        @echo "    [SH]     $@"
-       $(Q)bash version.sh
+       $(Q)bash ./config.status --silent $@
+
+mktables: kernel-lib/mktables.c
+       @echo "    [CC]     $@"
+       $(Q)$(CC) $(CFLAGS) $< -o $@
+
+# the target can be regenerated manually using mktables, but a local copy is
+# kept so the build process is simpler
+kernel-lib/tables.c:
+       @echo "    [TABLE]  $@"
+       $(Q)./mktables > $@ || ($(RM) -f $@ && exit 1)
+
+libbtrfs: $(libs_shared) $(lib_links)
 
 $(libs_shared): $(libbtrfs_objects) $(lib_links) send.h
        @echo "    [LD]     $@"
-       $(Q)$(CC) $(CFLAGS) $(libbtrfs_objects) $(LDFLAGS) $(lib_LIBS) \
-               -shared -Wl,-soname,libbtrfs.so -o libbtrfs.so.0.1
+       $(Q)$(CC) $(CFLAGS) $(libbtrfs_objects) $(LDFLAGS) $(LIBBTRFS_LIBS) \
+               -shared -Wl,-soname,libbtrfs.so.0 -o libbtrfs.so.0.1
 
 $(libs_static): $(libbtrfs_objects)
        @echo "    [AR]     $@"
-       $(Q)$(AR) cru libbtrfs.a $(libbtrfs_objects)
+       $(Q)$(AR) cr libbtrfs.a $(libbtrfs_objects)
 
 $(lib_links):
        @echo "    [LN]     $@"
-       $(Q)$(LN) -sf libbtrfs.so.0.1 libbtrfs.so.0
-       $(Q)$(LN) -sf libbtrfs.so.0.1 libbtrfs.so
+       $(Q)$(LN_S) -f libbtrfs.so.0.1 $@
 
 # keep intermediate files from the below implicit rules around
 .PRECIOUS: $(addsuffix .o,$(progs))
@@ -121,82 +378,229 @@ $(lib_links):
 # For static variants, use an extra $(subst) to get rid of the ".static"
 # from the target name before translating to list of libs
 
-btrfs-%.static: version.h $(static_objects) btrfs-%.static.o $(static_libbtrfs_objects)
+btrfs-%.static: btrfs-%.static.o $(static_objects) $(patsubst %.o,%.static.o,$(standalone_deps)) $(static_libbtrfs_objects)
        @echo "    [LD]     $@"
-       $(Q)$(CC) $(STATIC_CFLAGS) -o $@ $@.o $(static_objects) \
-               $(static_libbtrfs_objects) $(STATIC_LDFLAGS) $(STATIC_LIBS) \
-               $($(subst -,_,$(subst .static,,$@)-libs))
+       $(Q)$(CC) -o $@ $@.o $(static_objects) \
+               $(patsubst %.o, %.static.o, $($(subst -,_,$(subst .static,,$@)-objects))) \
+               $(static_libbtrfs_objects) $(STATIC_LDFLAGS) \
+               $($(subst -,_,$(subst .static,,$@)-libs)) $(STATIC_LIBS)
 
-btrfs-%: version.h $(objects) $(libs) btrfs-%.o
+btrfs-%: btrfs-%.o $(objects) $(standalone_deps) $(libs_static)
        @echo "    [LD]     $@"
-       $(Q)$(CC) $(CFLAGS) -o $@ $(objects) $@.o $(LDFLAGS) $(LIBS) $($(subst -,_,$@-libs))
+       $(Q)$(CC) -o $@ $(objects) $@.o \
+               $($(subst -,_,$@-objects)) \
+               $(libs_static) \
+               $(LDFLAGS) $(LIBS) $($(subst -,_,$@-libs))
 
-btrfs: $(objects) btrfs.o help.o $(cmds_objects) $(libs)
+btrfs: btrfs.o $(objects) $(cmds_objects) $(libs_static)
        @echo "    [LD]     $@"
-       $(Q)$(CC) $(CFLAGS) -o btrfs btrfs.o help.o $(cmds_objects) \
-               $(objects) $(LDFLAGS) $(LIBS) -lpthread
+       $(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_COMP)
 
-btrfs.static: $(static_objects) btrfs.static.o help.static.o $(static_cmds_objects) $(static_libbtrfs_objects)
+btrfs.static: btrfs.static.o $(static_objects) $(static_cmds_objects) $(static_libbtrfs_objects)
        @echo "    [LD]     $@"
-       $(Q)$(CC) $(STATIC_CFLAGS) -o btrfs.static btrfs.static.o help.static.o $(static_cmds_objects) \
-               $(static_objects) $(static_libbtrfs_objects) $(STATIC_LDFLAGS) $(STATIC_LIBS)
+       $(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP)
 
 # For backward compatibility, 'btrfs' changes behaviour to fsck if it's named 'btrfsck'
 btrfsck: btrfs
        @echo "    [LN]     $@"
-       $(Q)$(LN) -f btrfs btrfsck
+       $(Q)$(LN_S) -f btrfs btrfsck
+
+btrfsck.static: btrfs.static
+       @echo "    [LN]     $@"
+       $(Q)$(LN_S) -f $^ $@
+
+mkfs.btrfs: $(mkfs_objects) $(objects) $(libs_static)
+       @echo "    [LD]     $@"
+       $(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
+
+mkfs.btrfs.static: $(static_mkfs_objects) $(static_objects) $(static_libbtrfs_objects)
+       @echo "    [LD]     $@"
+       $(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS)
+
+btrfstune: btrfstune.o $(objects) $(libs_static)
+       @echo "    [LD]     $@"
+       $(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
 
-mkfs.btrfs: $(objects) $(libs) mkfs.o
+btrfstune.static: btrfstune.static.o $(static_objects) $(static_libbtrfs_objects)
        @echo "    [LD]     $@"
-       $(Q)$(CC) $(CFLAGS) -o mkfs.btrfs $(objects) mkfs.o $(LDFLAGS) $(LIBS)
+       $(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS)
 
-mkfs.btrfs.static: $(static_objects) mkfs.static.o $(static_libbtrfs_objects)
+btrfs-image: $(image_objects) $(objects) $(libs_static)
        @echo "    [LD]     $@"
-       $(Q)$(CC) $(STATIC_CFLAGS) -o mkfs.btrfs.static mkfs.static.o $(static_objects) \
-               $(static_libbtrfs_objects) $(STATIC_LDFLAGS) $(STATIC_LIBS)
+       $(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBS_COMP)
 
-btrfstune: $(objects) $(libs) btrfstune.o
+btrfs-image.static: $(static_image_objects) $(static_objects) $(static_libbtrfs_objects)
        @echo "    [LD]     $@"
-       $(Q)$(CC) $(CFLAGS) -o btrfstune $(objects) btrfstune.o $(LDFLAGS) $(LIBS)
+       $(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(STATIC_LIBS) $(STATIC_LIBS_COMP)
 
-dir-test: $(objects) $(libs) dir-test.o
+btrfs-convert: $(convert_objects) $(objects) $(libs_static)
        @echo "    [LD]     $@"
-       $(Q)$(CC) $(CFLAGS) -o dir-test $(objects) dir-test.o $(LDFLAGS) $(LIBS)
+       $(Q)$(CC) -o $@ $^ $(LDFLAGS) $(btrfs_convert_libs) $(LIBS)
 
-quick-test: $(objects) $(libs) quick-test.o
+btrfs-convert.static: $(static_convert_objects) $(static_objects) $(static_libbtrfs_objects)
        @echo "    [LD]     $@"
-       $(Q)$(CC) $(CFLAGS) -o quick-test $(objects) quick-test.o $(LDFLAGS) $(LIBS)
+       $(Q)$(CC) -o $@ $^ $(STATIC_LDFLAGS) $(btrfs_convert_libs) $(STATIC_LIBS)
 
-ioctl-test: $(objects) $(libs) ioctl-test.o
+dir-test: dir-test.o $(objects) $(libs)
        @echo "    [LD]     $@"
-       $(Q)$(CC) $(CFLAGS) -o ioctl-test $(objects) ioctl-test.o $(LDFLAGS) $(LIBS)
+       $(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
 
-send-test: $(objects) $(libs) send-test.o
+quick-test: quick-test.o $(objects) $(libs)
        @echo "    [LD]     $@"
-       $(Q)$(CC) $(CFLAGS) -o send-test $(objects) send-test.o $(LDFLAGS) $(LIBS) -lpthread
+       $(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
+
+ioctl-test.o: ioctl-test.c ioctl.h kerncompat.h ctree.h
+       @echo "    [CC]   $@"
+       $(Q)$(CC) $(CFLAGS) -c $< -o $@
+
+ioctl-test-32.o: ioctl-test.c ioctl.h kerncompat.h ctree.h
+       @echo "    [CC32]   $@"
+       $(Q)$(CC) $(CFLAGS) -m32 -c $< -o $@
+
+ioctl-test-64.o: ioctl-test.c ioctl.h kerncompat.h ctree.h
+       @echo "    [CC64]   $@"
+       $(Q)$(CC) $(CFLAGS) -m64 -c $< -o $@
+
+ioctl-test: ioctl-test.o
+       @echo "    [LD]   $@"
+       $(Q)$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
+       @echo "   ?[PAHOLE] $@.pahole"
+       -$(Q)pahole $@ > $@.pahole
+
+ioctl-test-32: ioctl-test-32.o
+       @echo "    [LD32]   $@"
+       $(Q)$(CC) -m32 -o $@ $< $(LDFLAGS)
+       @echo "   ?[PAHOLE] $@.pahole"
+       -$(Q)pahole $@ > $@.pahole
+
+ioctl-test-64: ioctl-test-64.o
+       @echo "    [LD64]   $@"
+       $(Q)$(CC) -m64 -o $@ $< $(LDFLAGS)
+       @echo "   ?[PAHOLE] $@.pahole"
+       -$(Q)pahole $@ > $@.pahole
+
+test-ioctl: ioctl-test ioctl-test-32 ioctl-test-64
+       @echo "    [TEST/ioctl]"
+       $(Q)./ioctl-test > ioctl-test.log
+       $(Q)./ioctl-test-32 > ioctl-test-32.log
+       $(Q)./ioctl-test-64 > ioctl-test-64.log
+
+library-test: library-test.c $(libs_shared)
+       @echo "    [TEST PREP]  $@"$(eval TMPD=$(shell mktemp -d))
+       $(Q)mkdir -p $(TMPD)/include/btrfs && \
+       cp $(libbtrfs_headers) $(TMPD)/include/btrfs && \
+       cd $(TMPD) && $(CC) -I$(TMPD)/include -o $@ $(addprefix $(ABSTOPDIR)/,$^) -Wl,-rpath=$(ABSTOPDIR) -lbtrfs
+       @echo "    [TEST RUN]   $@"
+       $(Q)cd $(TMPD) && ./$@
+       @echo "    [TEST CLEAN] $@"
+       $(Q)$(RM) -rf -- $(TMPD)
+
+library-test.static: library-test.c $(libs_static)
+       @echo "    [TEST PREP]  $@"$(eval TMPD=$(shell mktemp -d))
+       $(Q)mkdir -p $(TMPD)/include/btrfs && \
+       cp $(libbtrfs_headers) $(TMPD)/include/btrfs && \
+       cd $(TMPD) && $(CC) -I$(TMPD)/include -o $@ $(addprefix $(ABSTOPDIR)/,$^) $(STATIC_LDFLAGS) $(STATIC_LIBS)
+       @echo "    [TEST RUN]   $@"
+       $(Q)cd $(TMPD) && ./$@
+       @echo "    [TEST CLEAN] $@"
+       $(Q)$(RM) -rf -- $(TMPD)
+
+fssum: tests/fssum.c tests/sha224-256.c
+       @echo "    [LD]     $@"
+       $(Q)$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+
+test-build: test-build-pre test-build-real
+
+test-build-pre:
+       $(MAKE) $(MAKEOPTS) clean-all
+       ./autogen.sh
+       ./configure
+
+test-build-real:
+       $(MAKE) $(MAKEOPTS) library-test
+       -$(MAKE) $(MAKEOPTS) library-test.static
+       $(MAKE) $(MAKEOPTS) -j 8 all
+       -$(MAKE) $(MAKEOPTS) -j 8 static
+       $(MAKE) $(MAKEOPTS) -j 8 $(progs_extra)
 
 manpages:
-       $(Q)$(MAKE) $(MAKEOPTS) -C man
+       $(Q)$(MAKE) $(MAKEOPTS) -C Documentation
+
+tags: FORCE
+       @echo "    [TAGS]   $(TAGS_CMD)"
+       $(Q)$(TAGS_CMD) *.[ch] image/*.[ch] convert/*.[ch] mkfs/*.[ch]
 
-install-man:
-       cd man; $(MAKE) install
+cscope: FORCE
+       @echo "    [CSCOPE] $(CSCOPE_CMD)"
+       $(Q)ls -1 *.[ch] image/*.[ch] convert/*.[ch] mkfs/*.[ch] > cscope.files
+       $(Q)$(CSCOPE_CMD)
 
-clean :
+clean-all: clean clean-doc clean-gen
+
+clean: $(CLEANDIRS)
        @echo "Cleaning"
-       $(Q)rm -f $(progs) cscope.out *.o .*.d btrfs-convert btrfs-image btrfs-select-super \
-             btrfs-zero-log btrfstune dir-test ioctl-test quick-test send-test btrfsck \
-             btrfs.static mkfs.btrfs.static btrfs-calc-size \
-             version.h \
-             $(libs) $(lib_links)
-       $(Q)$(MAKE) $(MAKEOPTS) -C man $@
-
-install: $(libs) $(progs) install-man
+       $(Q)$(RM) -f -- $(progs) *.o *.o.d \
+               kernel-lib/*.o kernel-lib/*.o.d \
+               kernel-shared/*.o kernel-shared/*.o.d \
+               image/*.o image/*.o.d \
+               convert/*.o convert/*.o.d \
+               mkfs/*.o mkfs/*.o.d \
+             dir-test ioctl-test quick-test library-test library-test-static \
+              mktables btrfs.static mkfs.btrfs.static fssum \
+             $(check_defs) \
+             $(libs) $(lib_links) \
+             $(progs_static) $(progs_extra)
+
+clean-doc:
+       @echo "Cleaning Documentation"
+       $(Q)$(MAKE) $(MAKEOPTS) -C Documentation clean
+
+clean-gen:
+       @echo "Cleaning Generated Files"
+       $(Q)$(RM) -rf -- version.h config.status config.cache connfig.log \
+               configure.lineno config.status.lineno Makefile.inc \
+               Documentation/Makefile tags \
+               cscope.files cscope.out cscope.in.out cscope.po.out \
+               config.log config.h config.h.in~ aclocal.m4 \
+               configure autom4te.cache/ config/
+
+$(CLEANDIRS):
+       @echo "Cleaning $(patsubst clean-%,%,$@)"
+       $(Q)$(MAKE) $(MAKEOPTS) -C $(patsubst clean-%,%,$@) clean
+
+install: $(libs) $(progs_install) $(INSTALLDIRS)
        $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
-       $(INSTALL) $(progs) $(DESTDIR)$(bindir)
+       $(INSTALL) $(progs_install) $(DESTDIR)$(bindir)
+       $(INSTALL) fsck.btrfs $(DESTDIR)$(bindir)
+       # btrfsck is a link to btrfs in the src tree, make it so for installed file as well
+       $(LN_S) -f btrfs $(DESTDIR)$(bindir)/btrfsck
        $(INSTALL) -m755 -d $(DESTDIR)$(libdir)
        $(INSTALL) $(libs) $(DESTDIR)$(libdir)
        cp -a $(lib_links) $(DESTDIR)$(libdir)
        $(INSTALL) -m755 -d $(DESTDIR)$(incdir)
        $(INSTALL) -m644 $(headers) $(DESTDIR)$(incdir)
+ifneq ($(udevdir),)
+       $(INSTALL) -m755 -d $(DESTDIR)$(udevruledir)
+       $(INSTALL) -m644 $(udev_rules) $(DESTDIR)$(udevruledir)
+endif
 
--include .*.d
+install-static: $(progs_static) $(INSTALLDIRS)
+       $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
+       $(INSTALL) $(progs_static) $(DESTDIR)$(bindir)
+       # btrfsck is a link to btrfs in the src tree, make it so for installed file as well
+       $(LN_S) -f btrfs.static $(DESTDIR)$(bindir)/btrfsck.static
+
+$(INSTALLDIRS):
+       @echo "Making install in $(patsubst install-%,%,$@)"
+       $(Q)$(MAKE) $(MAKEOPTS) -C $(patsubst install-%,%,$@) install
+
+uninstall:
+       $(Q)$(MAKE) $(MAKEOPTS) -C Documentation uninstall
+       cd $(DESTDIR)$(incdir); $(RM) -f -- $(headers)
+       $(RMDIR) -p --ignore-fail-on-non-empty -- $(DESTDIR)$(incdir)
+       cd $(DESTDIR)$(libdir); $(RM) -f -- $(lib_links) $(libs)
+       cd $(DESTDIR)$(bindir); $(RM) -f -- btrfsck fsck.btrfs $(progs_install)
+
+ifneq ($(MAKECMDGOALS),clean)
+-include $(all_objects:.o=.o.d) $(subst .btrfs,, $(filter-out btrfsck.o.d, $(progs:=.o.d)))
+endif