summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2016-11-22 16:15:24 +0100
committerDavid Sterba <dsterba@suse.com>2016-11-24 13:06:29 +0100
commite5b7a27bf720ed33384190b9f4908bdfdc6347f5 (patch)
tree405cd35fe119a17254719e6dea40c6ead10f1b97
parent50e742a6b096116b0a0117127127775f8e03bff6 (diff)
btrfs-progs: move btrfs-image sources to own directory
There are no pending patches to btrfs-image, this looks like a good time to move it. Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--Makefile.in10
-rw-r--r--image/main.c (renamed from btrfs-image.c)0
2 files changed, 10 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in
index f662ee54..4c565cd8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -389,6 +389,15 @@ btrfstune.static: $(static_objects) btrfstune.static.o $(static_libbtrfs_objects
$(Q)$(CC) $(STATIC_CFLAGS) -o $@ btrfstune.static.o $(static_objects) \
$(static_libbtrfs_objects) $(STATIC_LDFLAGS) $(STATIC_LIBS)
+btrfs-image: $(objects) $(libs_static) image/main.o
+ @echo " [LD] $@"
+ $(Q)$(CC) $(CFLAGS) -I$(TOPDIR)/image -o btrfs-image $(objects) image/main.o $(libs_static) $(LDFLAGS) $(LIBS)
+
+btrfs-image.static: $(static_objects) image/main.static.o $(static_libbtrfs_objects)
+ @echo " [LD] $@"
+ $(Q)$(CC) $(STATIC_CFLAGS) -o $@ image/main.static.o $(static_objects) \
+ $(static_libbtrfs_objects) $(STATIC_LDFLAGS) $(STATIC_LIBS)
+
dir-test: $(objects) $(libs) dir-test.o
@echo " [LD] $@"
$(Q)$(CC) $(CFLAGS) -o dir-test $(objects) $(libs) dir-test.o $(LDFLAGS) $(LIBS)
@@ -465,6 +474,7 @@ clean: $(CLEANDIRS)
@echo "Cleaning"
$(Q)$(RM) -f -- $(progs) cscope.out *.o *.o.d \
kernel-lib/*.o kernel-lib/*.o.d \
+ image/*.o image/*.o.d \
dir-test ioctl-test quick-test library-test library-test-static \
btrfs.static mkfs.btrfs.static \
$(check_defs) \
diff --git a/btrfs-image.c b/image/main.c
index 066baf99..066baf99 100644
--- a/btrfs-image.c
+++ b/image/main.c