btrfs-progs: move btrfs-convert to own directory
authorDavid Sterba <dsterba@suse.com>
Mon, 28 Nov 2016 13:35:53 +0000 (14:35 +0100)
committerDavid Sterba <dsterba@suse.com>
Wed, 14 Dec 2016 14:06:35 +0000 (15:06 +0100)
Signed-off-by: David Sterba <dsterba@suse.com>
Makefile.in
convert/main.c [moved from btrfs-convert.c with 100% similarity]

index 8bfabe0..e9af489 100644 (file)
@@ -401,6 +401,16 @@ btrfs-image.static: $(static_objects) image/main.static.o $(static_libbtrfs_obje
        $(Q)$(CC) $(STATIC_CFLAGS) -o $@ image/main.static.o $(static_objects) \
                $(static_libbtrfs_objects) $(STATIC_LDFLAGS) $(STATIC_LIBS)
 
+btrfs-convert: $(objects) $(libs_static) convert/main.o
+       @echo "    [LD]     $@"
+       $(Q)$(CC) $(CFLAGS) -I$(TOPDIR)/convert -o btrfs-convert $(objects) convert/main.o $(libs_static) \
+               $(LDFLAGS) $(btrfs_convert_libs) $(LIBS)
+
+btrfs-convert.static: $(static_objects) convert/main.static.o $(static_libbtrfs_objects)
+       @echo "    [LD]     $@"
+       $(Q)$(CC) $(STATIC_CFLAGS) -o $@ convert/main.static.o $(static_objects) \
+               $(static_libbtrfs_objects) $(STATIC_LDFLAGS) $(btrfs_convert_libs) $(STATIC_LIBS)
+
 dir-test: $(objects) $(libs) dir-test.o
        @echo "    [LD]     $@"
        $(Q)$(CC) $(CFLAGS) -o dir-test $(objects) $(libs) dir-test.o $(LDFLAGS) $(LIBS)
@@ -482,6 +492,7 @@ clean: $(CLEANDIRS)
        $(Q)$(RM) -f -- $(progs) cscope.out *.o *.o.d \
                kernel-lib/*.o kernel-lib/*.o.d \
                image/*.o image/*.o.d \
+               convert/*.o convert/*.o.d \
              dir-test ioctl-test quick-test library-test library-test-static \
              btrfs.static mkfs.btrfs.static \
              $(check_defs) \
similarity index 100%
rename from btrfs-convert.c
rename to convert/main.c