RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: move include from toplevel directory to include/ 

In order to reduce number of files in the toplevel directory,

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2023-02-21 01:41:21 +01:00
parent 602096162a
commit 140234dc0d
8 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -55,9 +55,9 @@
/autom4te.cache /autom4te.cache
/config.cache /config.cache
/config/* /config/*
/config.h /include/config.h
/config.h.in /include/config.h.in
/config.h.in~ /include/config.h.in~
/config.log /config.log
/config.status /config.status
/configure /configure

11
Makefile
View File

@ -89,7 +89,7 @@ ENABLE_WARNING_FLAGS := $(call cc-option, -Wimplicit-fallthrough)
# Common build flags # Common build flags
CFLAGS = $(SUBST_CFLAGS) \ CFLAGS = $(SUBST_CFLAGS) \
-std=gnu11 \ -std=gnu11 \
-include config.h \ -include include/config.h \
-DBTRFS_FLAT_INCLUDES \ -DBTRFS_FLAT_INCLUDES \
-D_XOPEN_SOURCE=700 \ -D_XOPEN_SOURCE=700 \
-fno-strict-aliasing \ -fno-strict-aliasing \
@ -97,6 +97,7 @@ CFLAGS = $(SUBST_CFLAGS) \
-Wall \ -Wall \
-Wunused-but-set-parameter \ -Wunused-but-set-parameter \
-I$(TOPDIR) \ -I$(TOPDIR) \
-I$(TOPDIR)/include \
$(CRYPTO_CFLAGS) \ $(CRYPTO_CFLAGS) \
-DCOMPRESSION_LZO=$(COMPRESSION_LZO) \ -DCOMPRESSION_LZO=$(COMPRESSION_LZO) \
-DCOMPRESSION_ZSTD=$(COMPRESSION_ZSTD) \ -DCOMPRESSION_ZSTD=$(COMPRESSION_ZSTD) \
@ -695,15 +696,15 @@ quick-test: quick-test.o $(objects) libbtrfsutil.a $(libs_shared)
@echo " [LD] $@" @echo " [LD] $@"
$(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(Q)$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
ioctl-test.o: tests/ioctl-test.c ioctl.h kerncompat.h kernel-shared/ctree.h ioctl-test.o: tests/ioctl-test.c include/ioctl.h include/kerncompat.h kernel-shared/ctree.h
@echo " [CC] $@" @echo " [CC] $@"
$(Q)$(CC) $(CFLAGS) -c $< -o $@ $(Q)$(CC) $(CFLAGS) -c $< -o $@
ioctl-test-32.o: tests/ioctl-test.c ioctl.h kerncompat.h kernel-shared/ctree.h ioctl-test-32.o: tests/ioctl-test.c include/ioctl.h include/kerncompat.h kernel-shared/ctree.h
@echo " [CC32] $@" @echo " [CC32] $@"
$(Q)$(CC) $(CFLAGS) -m32 -c $< -o $@ $(Q)$(CC) $(CFLAGS) -m32 -c $< -o $@
ioctl-test-64.o: tests/ioctl-test.c ioctl.h kerncompat.h kernel-shared/ctree.h ioctl-test-64.o: tests/ioctl-test.c include/ioctl.h include/kerncompat.h kernel-shared/ctree.h
@echo " [CC64] $@" @echo " [CC64] $@"
$(Q)$(CC) $(CFLAGS) -m64 -c $< -o $@ $(Q)$(CC) $(CFLAGS) -m64 -c $< -o $@
@ -852,7 +853,7 @@ clean-gen:
configure.lineno config.status.lineno Makefile.inc \ configure.lineno config.status.lineno Makefile.inc \
Documentation/Makefile tags TAGS \ Documentation/Makefile tags TAGS \
cscope.files cscope.out cscope.in.out cscope.po.out \ cscope.files cscope.out cscope.in.out cscope.po.out \
config.log config.h config.h.in~ aclocal.m4 \ config.log include/config.h include/config.h.in~ aclocal.m4 \
configure autom4te.cache/ config/ configure autom4te.cache/ config/
clean-dep: clean-dep:

2
configure.ac
View File

@ -427,7 +427,7 @@ AC_SUBST([BTRFS_UTIL_VERSION_MAJOR])
AC_SUBST([BTRFS_UTIL_VERSION_MINOR]) AC_SUBST([BTRFS_UTIL_VERSION_MINOR])
AC_SUBST([BTRFS_UTIL_VERSION_PATCH]) AC_SUBST([BTRFS_UTIL_VERSION_PATCH])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([include/config.h])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile.inc Makefile.inc

2
crypto/hash-speedtest.c
View File

@ -14,7 +14,7 @@
* Boston, MA 021110-1307, USA. * Boston, MA 021110-1307, USA.
*/ */
#include "../kerncompat.h" #include "kerncompat.h"
#include <time.h> #include <time.h>
#include <getopt.h> #include <getopt.h>
#include <unistd.h> #include <unistd.h>

2
crypto/hash-vectest.c
View File

@ -14,7 +14,7 @@
* Boston, MA 021110-1307, USA. * Boston, MA 021110-1307, USA.
*/ */
#include "../kerncompat.h" #include "kerncompat.h"
#include "crypto/hash.h" #include "crypto/hash.h"
#include "crypto/crc32c.h" #include "crypto/crc32c.h"
#include "crypto/sha.h" #include "crypto/sha.h"

2
crypto/hash.h
View File

@ -17,7 +17,7 @@
#ifndef CRYPTO_HASH_H #ifndef CRYPTO_HASH_H
#define CRYPTO_HASH_H #define CRYPTO_HASH_H
#include "../kerncompat.h" #include "kerncompat.h"
#define CRYPTO_HASH_SIZE_MAX 32 #define CRYPTO_HASH_SIZE_MAX 32

0
ioctl.h → include/ioctl.h
View File

0
kerncompat.h → include/kerncompat.h
View File