path: root/Makefile
diff options
authorChris Mason <>2012-02-08 22:26:26 -0500
committerChris Mason <>2012-02-08 23:11:49 -0500
commitd01fcebeb5187569d2ac29ba8aa2518f76e4f2b0 (patch)
tree7569d55193c0a219c1629591d9292c6e15d83827 /Makefile
parent3e5b13bfb5011687da4283c02117af789c13b8fc (diff)
Fix btrfs-convert, btrfs-restore and btrfs-find-root build
Signed-off-by: Chris Mason <> fixit Signed-off-by: Chris Mason <>
Diffstat (limited to 'Makefile')
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index acc6b13b..3b887e18 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,8 @@ LIBS=-luuid
progs = btrfsctl mkfs.btrfs btrfs-debug-tree btrfs-show btrfs-vol btrfsck \
- btrfs btrfs-map-logical btrfs-image btrfs-zero-log
+ btrfs btrfs-map-logical btrfs-image btrfs-zero-log btrfs-convert \
+ btrfs-find-root btrfs-restore btrfstune
# make C=1 to enable sparse
ifdef C
@@ -45,11 +46,11 @@ btrfs: $(objects) btrfs.o help.o common.o $(cmds_objects)
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)
+btrfs-find-root: $(objects) find-root.o
+ gcc $(CFLAGS) -o btrfs-find-root find-root.o $(objects) $(LDFLAGS) $(LIBS)
-restore: $(objects) restore.o
- gcc $(CFLAGS) -o restore restore.o $(objects) $(LDFLAGS) $(LIBS) $(RESTORE_LIBS)
+btrfs-restore: $(objects) restore.o
+ gcc $(CFLAGS) -o btrfs-restore restore.o $(objects) $(LDFLAGS) $(LIBS) $(RESTORE_LIBS)
btrfsctl: $(objects) btrfsctl.o
$(CC) $(CFLAGS) -o btrfsctl btrfsctl.o $(objects) $(LDFLAGS) $(LIBS)
@@ -93,7 +94,7 @@ dir-test: $(objects) dir-test.o
quick-test: $(objects) quick-test.o
$(CC) $(CFLAGS) -o quick-test $(objects) quick-test.o $(LDFLAGS) $(LIBS)
-convert: $(objects) convert.o
+btrfs-convert: $(objects) convert.o
$(CC) $(CFLAGS) -o btrfs-convert $(objects) convert.o -lext2fs -lcom_err $(LDFLAGS) $(LIBS)
ioctl-test: $(objects) ioctl-test.o
@@ -113,6 +114,5 @@ clean :
install: $(progs) install-man
$(INSTALL) -m755 -d $(DESTDIR)$(bindir)
$(INSTALL) $(progs) $(DESTDIR)$(bindir)
- if [ -e btrfs-convert ]; then $(INSTALL) btrfs-convert $(DESTDIR)$(bindir); fi
-include .*.d