Skip to content

Commit d4c7f01

Browse files
committed
btrfs-progs: libbtrfs: move version.h to the directory
The header is part of the public API and not used by any other code so move it to the other files. Signed-off-by: David Sterba <dsterba@suse.com>
1 parent e8d8949 commit d4c7f01

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*.o.d
44

55
/.cc-defines.h
6-
/version.h
6+
/libbtrfs/version.h
77
/btrfs
88
/btrfs.static
99
/btrfs-map-logical

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ libbtrfs_objects = \
221221

222222
libbtrfs_headers = libbtrfs/send-stream.h libbtrfs/send-utils.h libbtrfs/send.h kernel-lib/rbtree.h \
223223
kernel-lib/list.h kernel-lib/rbtree_types.h libbtrfs/kerncompat.h \
224-
libbtrfs/ioctl.h libbtrfs/ctree.h version.h
224+
libbtrfs/ioctl.h libbtrfs/ctree.h libbtrfs/version.h
225225
libbtrfsutil_major := $(shell sed -rn 's/^\#define BTRFS_UTIL_VERSION_MAJOR ([0-9])+$$/\1/p' libbtrfsutil/btrfsutil.h)
226226
libbtrfsutil_minor := $(shell sed -rn 's/^\#define BTRFS_UTIL_VERSION_MINOR ([0-9])+$$/\1/p' libbtrfsutil/btrfsutil.h)
227227
libbtrfsutil_patch := $(shell sed -rn 's/^\#define BTRFS_UTIL_VERSION_PATCH ([0-9])+$$/\1/p' libbtrfsutil/btrfsutil.h)
@@ -532,7 +532,7 @@ endif
532532
#
533533
static: $(progs_static) libbtrfs.a libbtrfsutil.a
534534

535-
version.h: version.h.in configure.ac
535+
libbtrfs/version.h: libbtrfs/version.h.in configure.ac
536536
@echo " [SH] $@"
537537
$(Q)bash ./config.status --silent $@
538538

@@ -834,7 +834,7 @@ clean-doc:
834834

835835
clean-gen:
836836
@echo "Cleaning Generated Files"
837-
$(Q)$(RM) -rf -- version.h config.status config.cache config.log \
837+
$(Q)$(RM) -rf -- libbtrfs/version.h config.status config.cache config.log \
838838
configure.lineno config.status.lineno Makefile.inc \
839839
Documentation/Makefile tags TAGS \
840840
cscope.files cscope.out cscope.in.out cscope.po.out \

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ AC_CONFIG_HEADERS([config.h])
426426
AC_CONFIG_FILES([
427427
Makefile.inc
428428
Documentation/Makefile
429-
version.h
429+
libbtrfs/version.h
430430
libbtrfsutil/libbtrfsutil.pc
431431
])
432432

File renamed without changes.

tests/library-test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#if BTRFS_FLAT_INCLUDES
2020
#include "kerncompat.h"
21-
#include "version.h"
21+
#include "libbtrfs/version.h"
2222
#include "kernel-lib/rbtree.h"
2323
#include "kernel-lib/list.h"
2424
#include "kernel-shared/ctree.h"

0 commit comments

Comments
 (0)