From 467619772c28aecb0146315c8ae5702dacfb01cb Mon Sep 17 00:00:00 2001 From: Calvin Walton Date: Sun, 11 Jan 2009 15:45:04 -0500 Subject: [PATCH 2/2] Move components of libbtrfs to a subdirectory Simple file rename and updating the makefile. This seperates the code of the new 'libbtrfs' into its own directory, cleaning up the source code a bit. Signed-off-by: Calvin Walton --- .gitignore | 1 + Makefile.am | 96 +++++++++++++++-------------- crc32c.c => libbtrfs/crc32c.c | 0 crc32c.h => libbtrfs/crc32c.h | 0 ctree.c => libbtrfs/ctree.c | 0 ctree.h => libbtrfs/ctree.h | 0 dir-item.c => libbtrfs/dir-item.c | 0 disk-io.c => libbtrfs/disk-io.c | 0 disk-io.h => libbtrfs/disk-io.h | 0 extent-cache.c => libbtrfs/extent-cache.c | 0 extent-cache.h => libbtrfs/extent-cache.h | 0 extent-tree.c => libbtrfs/extent-tree.c | 0 extent_io.c => libbtrfs/extent_io.c | 0 extent_io.h => libbtrfs/extent_io.h | 0 file-item.c => libbtrfs/file-item.c | 0 hash.h => libbtrfs/hash.h | 0 inode-item.c => libbtrfs/inode-item.c | 0 inode-map.c => libbtrfs/inode-map.c | 0 ioctl.h => libbtrfs/ioctl.h | 0 kerncompat.h => libbtrfs/kerncompat.h | 0 list.h => libbtrfs/list.h | 0 print-tree.c => libbtrfs/print-tree.c | 0 print-tree.h => libbtrfs/print-tree.h | 0 radix-tree.c => libbtrfs/radix-tree.c | 0 radix-tree.h => libbtrfs/radix-tree.h | 0 rbtree.c => libbtrfs/rbtree.c | 0 rbtree.h => libbtrfs/rbtree.h | 0 root-tree.c => libbtrfs/root-tree.c | 0 transaction.h => libbtrfs/transaction.h | 0 utils.c => libbtrfs/utils.c | 0 utils.h => libbtrfs/utils.h | 0 volumes.c => libbtrfs/volumes.c | 0 volumes.h => libbtrfs/volumes.h | 0 33 files changed, 50 insertions(+), 47 deletions(-) rename crc32c.c => libbtrfs/crc32c.c (100%) rename crc32c.h => libbtrfs/crc32c.h (100%) rename ctree.c => libbtrfs/ctree.c (100%) rename ctree.h => libbtrfs/ctree.h (100%) rename dir-item.c => libbtrfs/dir-item.c (100%) rename disk-io.c => libbtrfs/disk-io.c (100%) rename disk-io.h => libbtrfs/disk-io.h (100%) rename extent-cache.c => libbtrfs/extent-cache.c (100%) rename extent-cache.h => libbtrfs/extent-cache.h (100%) rename extent-tree.c => libbtrfs/extent-tree.c (100%) rename extent_io.c => libbtrfs/extent_io.c (100%) rename extent_io.h => libbtrfs/extent_io.h (100%) rename file-item.c => libbtrfs/file-item.c (100%) rename hash.h => libbtrfs/hash.h (100%) rename inode-item.c => libbtrfs/inode-item.c (100%) rename inode-map.c => libbtrfs/inode-map.c (100%) rename ioctl.h => libbtrfs/ioctl.h (100%) rename kerncompat.h => libbtrfs/kerncompat.h (100%) rename list.h => libbtrfs/list.h (100%) rename print-tree.c => libbtrfs/print-tree.c (100%) rename print-tree.h => libbtrfs/print-tree.h (100%) rename radix-tree.c => libbtrfs/radix-tree.c (100%) rename radix-tree.h => libbtrfs/radix-tree.h (100%) rename rbtree.c => libbtrfs/rbtree.c (100%) rename rbtree.h => libbtrfs/rbtree.h (100%) rename root-tree.c => libbtrfs/root-tree.c (100%) rename transaction.h => libbtrfs/transaction.h (100%) rename utils.c => libbtrfs/utils.c (100%) rename utils.h => libbtrfs/utils.h (100%) rename volumes.c => libbtrfs/volumes.c (100%) rename volumes.h => libbtrfs/volumes.h (100%) diff --git a/.gitignore b/.gitignore index c3d0da7..48fa13e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *.lo *.o .deps +.dirstamp .libs Makefile Makefile.in diff --git a/Makefile.am b/Makefile.am index 64772a3..36c0924 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 +AM_CPPFLAGS = -I$(srcdir)/libbtrfs + sbin_PROGRAMS = btrfs-debug-tree \ btrfs-image \ btrfs-show \ @@ -11,75 +13,75 @@ sbin_PROGRAMS = btrfs-debug-tree \ @EXTRA_PROGRAMS@ EXTRA_PROGRAMS = btrfs-dir-test btrfs-quick-test btrfs-convert -lib_LTLIBRARIES = libbtrfs.la +lib_LTLIBRARIES = libbtrfs/libbtrfs.la btrfs_convert_SOURCES = convert.c -btrfs_convert_CPPFLAGS = @EXT2FS_CFLAGS@ -btrfs_convert_LDADD = -lbtrfs @EXT2FS_LIBS@ +btrfs_convert_CPPFLAGS = $(AM_CPPFLAGS) @EXT2FS_CFLAGS@ +btrfs_convert_LDADD = libbtrfs/libbtrfs.la @EXT2FS_LIBS@ btrfs_debug_tree_SOURCES = debug-tree.c -btrfs_debug_tree_LDADD = -lbtrfs +btrfs_debug_tree_LDADD = libbtrfs/libbtrfs.la btrfs_dir_test_SOURCES = dir-test.c -btrfs_dir_test_LDADD = -lbtrfs +btrfs_dir_test_LDADD = libbtrfs/libbtrfs.la btrfs_image_SOURCES = btrfs-image.c -btrfs_image_LDADD = -lbtrfs @PTHREAD_LIBS@ @ZLIB_LIBS@ +btrfs_image_LDADD = libbtrfs/libbtrfs.la @PTHREAD_LIBS@ @ZLIB_LIBS@ btrfs_quick_test_SOURCES = quick-test.c -btrfs_quick_test_LDADD = -lbtrfs +btrfs_quick_test_LDADD = libbtrfs/libbtrfs.la btrfs_show_SOURCES = btrfs-show.c -btrfs_show_LDADD = -lbtrfs +btrfs_show_LDADD = libbtrfs/libbtrfs.la btrfs_vol_SOURCES = btrfs-vol.c -btrfs_vol_LDADD = -lbtrfs +btrfs_vol_LDADD = libbtrfs/libbtrfs.la btrfsctl_SOURCES = btrfsctl.c -btrfsctl_LDADD = -lbtrfs +btrfsctl_LDADD = libbtrfs/libbtrfs.la btrfstune_SOURCES = btrfstune.c -btrfstune_LDADD = -lbtrfs +btrfstune_LDADD = libbtrfs/libbtrfs.la fsck_btrfs_SOURCES = btrfsck.c \ bit-radix.c \ bit-radix.h -fsck_btrfs_LDADD = -lbtrfs +fsck_btrfs_LDADD = libbtrfs/libbtrfs.la mkfs_btrfs_SOURCES = mkfs.c -mkfs_btrfs_LDADD = -lbtrfs +mkfs_btrfs_LDADD = libbtrfs/libbtrfs.la -libbtrfs_la_SOURCES = ctree.c \ - ctree.h \ - crc32c.c \ - crc32c.h \ - dir-item.c \ - disk-io.c \ - disk-io.h \ - extent-cache.c \ - extent-cache.h \ - extent_io.c \ - extent_io.h \ - extent-tree.c \ - file-item.c \ - hash.h \ - inode-item.c \ - inode-map.c \ - ioctl.h \ - kerncompat.h \ - list.h \ - print-tree.c \ - print-tree.h \ - radix-tree.c \ - radix-tree.h \ - rbtree.c \ - rbtree.h \ - root-tree.c \ - transaction.h \ - utils.c \ - utils.h \ - volumes.c \ - volumes.h -libbtrfs_la_LIBADD = @UUID_LIBS@ -libbtrfs_la_CPPFLAGS = @UUID_CFLAGS@ -libbtrfs_la_LDFLAGS = -version-info 0:0:0 +libbtrfs_libbtrfs_la_SOURCES = libbtrfs/ctree.c \ + libbtrfs/ctree.h \ + libbtrfs/crc32c.c \ + libbtrfs/crc32c.h \ + libbtrfs/dir-item.c \ + libbtrfs/disk-io.c \ + libbtrfs/disk-io.h \ + libbtrfs/extent-cache.c \ + libbtrfs/extent-cache.h \ + libbtrfs/extent_io.c \ + libbtrfs/extent_io.h \ + libbtrfs/extent-tree.c \ + libbtrfs/file-item.c \ + libbtrfs/hash.h \ + libbtrfs/inode-item.c \ + libbtrfs/inode-map.c \ + libbtrfs/ioctl.h \ + libbtrfs/kerncompat.h \ + libbtrfs/list.h \ + libbtrfs/print-tree.c \ + libbtrfs/print-tree.h \ + libbtrfs/radix-tree.c \ + libbtrfs/radix-tree.h \ + libbtrfs/rbtree.c \ + libbtrfs/rbtree.h \ + libbtrfs/root-tree.c \ + libbtrfs/transaction.h \ + libbtrfs/utils.c \ + libbtrfs/utils.h \ + libbtrfs/volumes.c \ + libbtrfs/volumes.h +libbtrfs_libbtrfs_la_LIBADD = @UUID_LIBS@ +libbtrfs_libbtrfs_la_CPPFLAGS = $(AM_CPPFLAGS) @UUID_CFLAGS@ +libbtrfs_libbtrfs_la_LDFLAGS = -version-info 0:0:0 diff --git a/crc32c.c b/libbtrfs/crc32c.c similarity index 100% rename from crc32c.c rename to libbtrfs/crc32c.c diff --git a/crc32c.h b/libbtrfs/crc32c.h similarity index 100% rename from crc32c.h rename to libbtrfs/crc32c.h diff --git a/ctree.c b/libbtrfs/ctree.c similarity index 100% rename from ctree.c rename to libbtrfs/ctree.c diff --git a/ctree.h b/libbtrfs/ctree.h similarity index 100% rename from ctree.h rename to libbtrfs/ctree.h diff --git a/dir-item.c b/libbtrfs/dir-item.c similarity index 100% rename from dir-item.c rename to libbtrfs/dir-item.c diff --git a/disk-io.c b/libbtrfs/disk-io.c similarity index 100% rename from disk-io.c rename to libbtrfs/disk-io.c diff --git a/disk-io.h b/libbtrfs/disk-io.h similarity index 100% rename from disk-io.h rename to libbtrfs/disk-io.h diff --git a/extent-cache.c b/libbtrfs/extent-cache.c similarity index 100% rename from extent-cache.c rename to libbtrfs/extent-cache.c diff --git a/extent-cache.h b/libbtrfs/extent-cache.h similarity index 100% rename from extent-cache.h rename to libbtrfs/extent-cache.h diff --git a/extent-tree.c b/libbtrfs/extent-tree.c similarity index 100% rename from extent-tree.c rename to libbtrfs/extent-tree.c diff --git a/extent_io.c b/libbtrfs/extent_io.c similarity index 100% rename from extent_io.c rename to libbtrfs/extent_io.c diff --git a/extent_io.h b/libbtrfs/extent_io.h similarity index 100% rename from extent_io.h rename to libbtrfs/extent_io.h diff --git a/file-item.c b/libbtrfs/file-item.c similarity index 100% rename from file-item.c rename to libbtrfs/file-item.c diff --git a/hash.h b/libbtrfs/hash.h similarity index 100% rename from hash.h rename to libbtrfs/hash.h diff --git a/inode-item.c b/libbtrfs/inode-item.c similarity index 100% rename from inode-item.c rename to libbtrfs/inode-item.c diff --git a/inode-map.c b/libbtrfs/inode-map.c similarity index 100% rename from inode-map.c rename to libbtrfs/inode-map.c diff --git a/ioctl.h b/libbtrfs/ioctl.h similarity index 100% rename from ioctl.h rename to libbtrfs/ioctl.h diff --git a/kerncompat.h b/libbtrfs/kerncompat.h similarity index 100% rename from kerncompat.h rename to libbtrfs/kerncompat.h diff --git a/list.h b/libbtrfs/list.h similarity index 100% rename from list.h rename to libbtrfs/list.h diff --git a/print-tree.c b/libbtrfs/print-tree.c similarity index 100% rename from print-tree.c rename to libbtrfs/print-tree.c diff --git a/print-tree.h b/libbtrfs/print-tree.h similarity index 100% rename from print-tree.h rename to libbtrfs/print-tree.h diff --git a/radix-tree.c b/libbtrfs/radix-tree.c similarity index 100% rename from radix-tree.c rename to libbtrfs/radix-tree.c diff --git a/radix-tree.h b/libbtrfs/radix-tree.h similarity index 100% rename from radix-tree.h rename to libbtrfs/radix-tree.h diff --git a/rbtree.c b/libbtrfs/rbtree.c similarity index 100% rename from rbtree.c rename to libbtrfs/rbtree.c diff --git a/rbtree.h b/libbtrfs/rbtree.h similarity index 100% rename from rbtree.h rename to libbtrfs/rbtree.h diff --git a/root-tree.c b/libbtrfs/root-tree.c similarity index 100% rename from root-tree.c rename to libbtrfs/root-tree.c diff --git a/transaction.h b/libbtrfs/transaction.h similarity index 100% rename from transaction.h rename to libbtrfs/transaction.h diff --git a/utils.c b/libbtrfs/utils.c similarity index 100% rename from utils.c rename to libbtrfs/utils.c diff --git a/utils.h b/libbtrfs/utils.h similarity index 100% rename from utils.h rename to libbtrfs/utils.h diff --git a/volumes.c b/libbtrfs/volumes.c similarity index 100% rename from volumes.c rename to libbtrfs/volumes.c diff --git a/volumes.h b/libbtrfs/volumes.h similarity index 100% rename from volumes.h rename to libbtrfs/volumes.h -- 1.6.1