eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-13 11:50:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify include directories.

Browse Source 
To avoid confusion, use just one lib include and specify sub-directories
for format inclusions.
This should also help some analysis tools to find proper includes.
This commit is contained in:
Milan Broz
2021-02-11 12:59:22 +01:00
parent 1ff2b85252
commit 12cc7ea745
7 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Makemodule.am
View File

@@ -15,15 +15,7 @@ libutils_io_la_SOURCES = \
lib/utils_io.c \ lib/utils_io.c \
lib/utils_io.h lib/utils_io.h
libcryptsetup_la_CPPFLAGS = $(AM_CPPFLAGS) \ libcryptsetup_la_CPPFLAGS = $(AM_CPPFLAGS)
-I $(top_srcdir)/lib/crypto_backend \
-I $(top_srcdir)/lib/luks1 \
-I $(top_srcdir)/lib/luks2 \
-I $(top_srcdir)/lib/loopaes \
-I $(top_srcdir)/lib/verity \
-I $(top_srcdir)/lib/tcrypt \
-I $(top_srcdir)/lib/integrity \
-I $(top_srcdir)/lib/bitlk
libcryptsetup_la_DEPENDENCIES = libutils_io.la libcrypto_backend.la lib/libcryptsetup.sym libcryptsetup_la_DEPENDENCIES = libutils_io.la libcrypto_backend.la lib/libcryptsetup.sym

2
lib/internal.h
View File

@@ -41,7 +41,7 @@
#include "utils_fips.h" #include "utils_fips.h"
#include "utils_keyring.h" #include "utils_keyring.h"
#include "utils_io.h" #include "utils_io.h"
#include "crypto_backend.h" #include "crypto_backend/crypto_backend.h"
#include "utils_storage_wrappers.h" #include "utils_storage_wrappers.h"
#include "libcryptsetup.h" #include "libcryptsetup.h"

14
lib/setup.c
View File

@@ -29,13 +29,13 @@
#include <errno.h> #include <errno.h>
#include "libcryptsetup.h" #include "libcryptsetup.h"
#include "luks.h" #include "luks1/luks.h"
#include "luks2.h" #include "luks2/luks2.h"
#include "loopaes.h" #include "loopaes/loopaes.h"
#include "verity.h" #include "verity/verity.h"
#include "tcrypt.h" #include "tcrypt/tcrypt.h"
#include "integrity.h" #include "integrity/integrity.h"
#include "bitlk.h" #include "bitlk/bitlk.h"
#include "utils_device_locking.h" #include "utils_device_locking.h"
#include "internal.h" #include "internal.h"

6
tests/Makefile.am
View File

@@ -89,19 +89,19 @@ differ_CFLAGS = $(AM_CFLAGS) -Wall -O2
api_test_SOURCES = api-test.c api_test.h test_utils.c api_test_SOURCES = api-test.c api_test.h test_utils.c
api_test_LDADD = $(LDADD) ../libcryptsetup.la api_test_LDADD = $(LDADD) ../libcryptsetup.la
api_test_LDFLAGS = $(AM_LDFLAGS) -static api_test_LDFLAGS = $(AM_LDFLAGS) -static
api_test_CFLAGS = -g -Wall -O0 $(AM_CFLAGS) -I$(top_srcdir)/lib/ -I$(top_srcdir)/lib/luks1 api_test_CFLAGS = -g -Wall -O0 $(AM_CFLAGS) -I$(top_srcdir)/lib
api_test_CPPFLAGS = $(AM_CPPFLAGS) -include config.h api_test_CPPFLAGS = $(AM_CPPFLAGS) -include config.h
api_test_2_SOURCES = api-test-2.c api_test.h test_utils.c api_test_2_SOURCES = api-test-2.c api_test.h test_utils.c
api_test_2_LDADD = $(LDADD) ../libcryptsetup.la api_test_2_LDADD = $(LDADD) ../libcryptsetup.la
api_test_2_LDFLAGS = $(AM_LDFLAGS) -static api_test_2_LDFLAGS = $(AM_LDFLAGS) -static
api_test_2_CFLAGS = -g -Wall -O0 $(AM_CFLAGS) -I$(top_srcdir)/lib/ -I$(top_srcdir)/lib/luks1 api_test_2_CFLAGS = -g -Wall -O0 $(AM_CFLAGS) -I$(top_srcdir)/lib
api_test_2_CPPFLAGS = $(AM_CPPFLAGS) -include config.h api_test_2_CPPFLAGS = $(AM_CPPFLAGS) -include config.h
vectors_test_SOURCES = crypto-vectors.c vectors_test_SOURCES = crypto-vectors.c
vectors_test_LDADD = ../libcrypto_backend.la @CRYPTO_LIBS@ @LIBARGON2_LIBS@ vectors_test_LDADD = ../libcrypto_backend.la @CRYPTO_LIBS@ @LIBARGON2_LIBS@
vectors_test_LDFLAGS = $(AM_LDFLAGS) -static vectors_test_LDFLAGS = $(AM_LDFLAGS) -static
vectors_test_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/lib/crypto_backend/ @CRYPTO_CFLAGS@ vectors_test_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/lib @CRYPTO_CFLAGS@
vectors_test_CPPFLAGS = $(AM_CPPFLAGS) -include config.h vectors_test_CPPFLAGS = $(AM_CPPFLAGS) -include config.h
unit_utils_io_SOURCES = unit-utils-io.c unit_utils_io_SOURCES = unit-utils-io.c

2
tests/api-test-2.c
View File

@@ -41,7 +41,7 @@ typedef int32_t key_serial_t;
#endif #endif
#include "api_test.h" #include "api_test.h"
#include "luks.h" #include "luks1/luks.h"
#include "libcryptsetup.h" #include "libcryptsetup.h"
#define DMDIR "/dev/mapper/" #define DMDIR "/dev/mapper/"

2
tests/api-test.c
View File

@@ -31,7 +31,7 @@
#include <sys/types.h> #include <sys/types.h>
#include "api_test.h" #include "api_test.h"
#include "luks.h" #include "luks1/luks.h"
#include "libcryptsetup.h" #include "libcryptsetup.h"
#define DMDIR "/dev/mapper/" #define DMDIR "/dev/mapper/"

2
tests/crypto-vectors.c
View File

@@ -23,7 +23,7 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include "crypto_backend.h" #include "crypto_backend/crypto_backend.h"
#ifndef ARRAY_SIZE #ifndef ARRAY_SIZE
# define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) # define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))