Merge branch 'recovery-beta' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[platform/upstream/btrfs-progs.git] / Makefile

diff --git a/Makefile b/Makefile
index 3a1e308..96e2002 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,30 +1,29 @@
-CC=gcc
+CC = gcc
 AM_CFLAGS = -Wall -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2
-CFLAGS = -g -Werror -Os
+CFLAGS = -g -O0
 objects = ctree.o disk-io.o radix-tree.o extent-tree.o print-tree.o \
          root-tree.o dir-item.o file-item.o inode-item.o \
          inode-map.o crc32c.o rbtree.o extent-cache.o extent_io.o \
          volumes.o utils.o btrfs-list.o btrfslabel.o
 
-#
-CHECKFLAGS=-D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise \
-               -Wuninitialized -Wshadow -Wundef
+CHECKFLAGS= -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise \
+           -Wuninitialized -Wshadow -Wundef
 DEPFLAGS = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@
 
-INSTALL= install
+INSTALL = install
 prefix ?= /usr/local
 bindir = $(prefix)/bin
 LIBS=-luuid
+RESTORE_LIBS=-lz
 
 progs = btrfsctl mkfs.btrfs btrfs-debug-tree btrfs-show btrfs-vol btrfsck \
-       btrfs \
-       btrfs-map-logical
+       btrfs btrfs-map-logical restore find-root calc-size btrfs-corrupt-block
 
 # make C=1 to enable sparse
 ifdef C
-       check=sparse $(CHECKFLAGS)
+       check = sparse $(CHECKFLAGS)
 else
-       check=ls
+       check = ls
 endif
 
 .c.o:
@@ -37,10 +36,19 @@ all: version $(progs) manpages
 version:
        bash version.sh
 
-btrfs: $(objects) btrfs.o btrfs_cmds.o
-       $(CC) -lpthread $(CFLAGS) -o btrfs btrfs.o btrfs_cmds.o \
+btrfs: $(objects) btrfs.o btrfs_cmds.o scrub.o
+       $(CC) -lpthread $(CFLAGS) -o btrfs btrfs.o btrfs_cmds.o scrub.o \
                $(objects) $(LDFLAGS) $(LIBS)
 
+calc-size: $(objects) calc-size.o
+       gcc $(CFLAGS) -o calc-size calc-size.o $(objects) $(LDFLAGS) $(LIBS)
+
+find-root: $(objects) find-root.o
+       gcc $(CFLAGS) -o find-root find-root.o $(objects) $(LDFLAGS) $(LIBS)
+
+restore: $(objects) restore.o
+       gcc $(CFLAGS) -o restore restore.o $(objects) $(LDFLAGS) $(LIBS) $(RESTORE_LIBS)
+
 btrfsctl: $(objects) btrfsctl.o
        $(CC) $(CFLAGS) -o btrfsctl btrfsctl.o $(objects) $(LDFLAGS) $(LIBS)
 
@@ -71,6 +79,9 @@ btrfstune: $(objects) btrfstune.o
 btrfs-map-logical: $(objects) btrfs-map-logical.o
        $(CC) $(CFLAGS) -o btrfs-map-logical $(objects) btrfs-map-logical.o $(LDFLAGS) $(LIBS)
 
+btrfs-corrupt-block: $(objects) btrfs-corrupt-block.o
+       $(CC) $(CFLAGS) -o btrfs-corrupt-block $(objects) btrfs-corrupt-block.o $(LDFLAGS) $(LIBS)
+
 btrfs-image: $(objects) btrfs-image.o
        $(CC) $(CFLAGS) -o btrfs-image $(objects) btrfs-image.o -lpthread -lz $(LDFLAGS) $(LIBS)