diff options
| author | Eric Sandeen <sandeen@redhat.com> | 2013-04-23 15:57:25 -0500 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2013-04-24 14:05:33 +0200 |
| commit | b1031dfae128819d06f5f8a2122871a49050dbbc (patch) | |
| tree | cb4bbd61fb38efbd12ee7da3361d0ab68fa7e373 | |
| parent | 6d26357f8e7d73d802e8025407fe17542a18164b (diff) | |
btrfs-progs: standardize tool source filenames
For any btrfs-$FOO executable, rename the main source file from
$FOO.c to to btrfs-$FOO.c
This makes it slightly more obvious what's building what,
and allows us to write a default rule in the Makefile for
these tools.
(also add btrfs-calc-size to the list of objects to remove
on make clean)
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
| -rw-r--r-- | Makefile | 26 | ||||
| -rw-r--r-- | btrfs-calc-size.c (renamed from calc-size.c) | 0 | ||||
| -rw-r--r-- | btrfs-convert.c (renamed from convert.c) | 0 | ||||
| -rw-r--r-- | btrfs-debug-tree.c (renamed from debug-tree.c) | 0 | ||||
| -rw-r--r-- | btrfs-find-root.c (renamed from find-root.c) | 0 | ||||
| -rw-r--r-- | btrfs-fragments.c (renamed from fragments.c) | 0 |
6 files changed, 13 insertions, 13 deletions
@@ -115,17 +115,17 @@ btrfs.static: $(static_objects) btrfs.static.o help.static.o $(static_cmds_objec $(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) -calc-size: $(objects) $(libs) calc-size.o +btrfs-calc-size: $(objects) $(libs) btrfs-calc-size.o @echo " [LD] $@" - $(Q)$(CC) $(CFLAGS) -o calc-size calc-size.o $(objects) $(LDFLAGS) $(LIBS) + $(Q)$(CC) $(CFLAGS) -o btrfs-calc-size btrfs-calc-size.o $(objects) $(LDFLAGS) $(LIBS) -btrfs-find-root: $(objects) $(libs) find-root.o +btrfs-find-root: $(objects) $(libs) btrfs-find-root.o @echo " [LD] $@" - $(Q)$(CC) $(CFLAGS) -o btrfs-find-root find-root.o $(objects) $(LDFLAGS) $(LIBS) + $(Q)$(CC) $(CFLAGS) -o btrfs-find-root btrfs-find-root.o $(objects) $(LDFLAGS) $(LIBS) -btrfs-find-root.static: $(static_objects) find-root.static.o $(static_libbtrfs_objects) +btrfs-find-root.static: $(static_objects) btrfs-find-root.static.o $(static_libbtrfs_objects) @echo " [LD] $@" - $(Q)$(CC) $(STATIC_CFLAGS) -o btrfs-find-root.static find-root.static.o $(static_objects) \ + $(Q)$(CC) $(STATIC_CFLAGS) -o btrfs-find-root.static btrfs-find-root.static.o $(static_objects) \ $(static_libbtrfs_objects) $(STATIC_LDFLAGS) $(STATIC_LIBS) # For backward compatibility, 'btrfs' changes behaviour to fsck if it's named 'btrfsck' @@ -142,9 +142,9 @@ mkfs.btrfs.static: $(static_objects) mkfs.static.o $(static_libbtrfs_objects) $(Q)$(CC) $(STATIC_CFLAGS) -o mkfs.btrfs.static mkfs.static.o $(static_objects) \ $(static_libbtrfs_objects) $(STATIC_LDFLAGS) $(STATIC_LIBS) -btrfs-debug-tree: $(objects) $(libs) debug-tree.o +btrfs-debug-tree: $(objects) $(libs) btrfs-debug-tree.o @echo " [LD] $@" - $(Q)$(CC) $(CFLAGS) -o btrfs-debug-tree $(objects) debug-tree.o $(LDFLAGS) $(LIBS) + $(Q)$(CC) $(CFLAGS) -o btrfs-debug-tree $(objects) btrfs-debug-tree.o $(LDFLAGS) $(LIBS) btrfs-zero-log: $(objects) $(libs) btrfs-zero-log.o @echo " [LD] $@" @@ -186,13 +186,13 @@ quick-test: $(objects) $(libs) quick-test.o @echo " [LD] $@" $(Q)$(CC) $(CFLAGS) -o quick-test $(objects) quick-test.o $(LDFLAGS) $(LIBS) -btrfs-convert: $(objects) $(libs) convert.o +btrfs-convert: $(objects) $(libs) btrfs-convert.o @echo " [LD] $@" - $(Q)$(CC) $(CFLAGS) -o btrfs-convert $(objects) convert.o -lext2fs -lcom_err $(LDFLAGS) $(LIBS) + $(Q)$(CC) $(CFLAGS) -o btrfs-convert $(objects) btrfs-convert.o -lext2fs -lcom_err $(LDFLAGS) $(LIBS) -btrfs-fragments: $(objects) $(libs) fragments.o +btrfs-fragments: $(objects) $(libs) btrfs-fragments.o @echo " [LD] $@" - $(Q)$(CC) $(CFLAGS) -o btrfs-fragments $(objects) fragments.o $(LDFLAGS) $(LIBS) -lgd -lpng -ljpeg -lfreetype + $(Q)$(CC) $(CFLAGS) -o btrfs-fragments $(objects) btrfs-fragments.o $(LDFLAGS) $(LIBS) -lgd -lpng -ljpeg -lfreetype ioctl-test: $(objects) $(libs) ioctl-test.o @echo " [LD] $@" @@ -212,7 +212,7 @@ clean : @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.static mkfs.btrfs.static btrfs-calc-size \ version.h \ $(libs) $(lib_links) $(Q)$(MAKE) $(MAKEOPTS) -C man $@ diff --git a/calc-size.c b/btrfs-calc-size.c index c4adfb0c..c4adfb0c 100644 --- a/calc-size.c +++ b/btrfs-calc-size.c diff --git a/convert.c b/btrfs-convert.c index 399856f9..399856f9 100644 --- a/convert.c +++ b/btrfs-convert.c diff --git a/debug-tree.c b/btrfs-debug-tree.c index bae7f945..bae7f945 100644 --- a/debug-tree.c +++ b/btrfs-debug-tree.c diff --git a/find-root.c b/btrfs-find-root.c index 810d8358..810d8358 100644 --- a/find-root.c +++ b/btrfs-find-root.c diff --git a/fragments.c b/btrfs-fragments.c index a012fe1b..a012fe1b 100644 --- a/fragments.c +++ b/btrfs-fragments.c |