From 12cc7ea74512dda90c4431861422595abcde728d Mon Sep 17 00:00:00 2001
From: Milan Broz <gmazyland@gmail.com>
Date: Thu, 11 Feb 2021 12:59:22 +0100
Subject: [PATCH] Simplify include directories.

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.
---
 lib/Makemodule.am      | 10 +---------
 lib/internal.h         |  2 +-
 lib/setup.c            | 14 +++++++-------
 tests/Makefile.am      |  6 +++---
 tests/api-test-2.c     |  2 +-
 tests/api-test.c       |  2 +-
 tests/crypto-vectors.c |  2 +-
 7 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index 3c503d14..e61cd4f4 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -15,15 +15,7 @@ libutils_io_la_SOURCES = \
 	lib/utils_io.c			\
 	lib/utils_io.h
 
-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_CPPFLAGS = $(AM_CPPFLAGS)
 
 libcryptsetup_la_DEPENDENCIES = libutils_io.la libcrypto_backend.la lib/libcryptsetup.sym
 
diff --git a/lib/internal.h b/lib/internal.h
index f50c4a19..8d4d458c 100644
--- a/lib/internal.h
+++ b/lib/internal.h
@@ -41,7 +41,7 @@
 #include "utils_fips.h"
 #include "utils_keyring.h"
 #include "utils_io.h"
-#include "crypto_backend.h"
+#include "crypto_backend/crypto_backend.h"
 #include "utils_storage_wrappers.h"
 
 #include "libcryptsetup.h"
diff --git a/lib/setup.c b/lib/setup.c
index 25281726..00da2117 100644
--- a/lib/setup.c
+++ b/lib/setup.c
@@ -29,13 +29,13 @@
 #include <errno.h>
 
 #include "libcryptsetup.h"
-#include "luks.h"
-#include "luks2.h"
-#include "loopaes.h"
-#include "verity.h"
-#include "tcrypt.h"
-#include "integrity.h"
-#include "bitlk.h"
+#include "luks1/luks.h"
+#include "luks2/luks2.h"
+#include "loopaes/loopaes.h"
+#include "verity/verity.h"
+#include "tcrypt/tcrypt.h"
+#include "integrity/integrity.h"
+#include "bitlk/bitlk.h"
 #include "utils_device_locking.h"
 #include "internal.h"
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1d7005af..7de10bfe 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -89,19 +89,19 @@ differ_CFLAGS = $(AM_CFLAGS) -Wall -O2
 api_test_SOURCES = api-test.c api_test.h test_utils.c
 api_test_LDADD = $(LDADD) ../libcryptsetup.la
 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_2_SOURCES = api-test-2.c api_test.h test_utils.c
 api_test_2_LDADD = $(LDADD) ../libcryptsetup.la
 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
 
 vectors_test_SOURCES = crypto-vectors.c
 vectors_test_LDADD = ../libcrypto_backend.la @CRYPTO_LIBS@ @LIBARGON2_LIBS@
 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
 
 unit_utils_io_SOURCES = unit-utils-io.c
diff --git a/tests/api-test-2.c b/tests/api-test-2.c
index 70af877b..003d0437 100644
--- a/tests/api-test-2.c
+++ b/tests/api-test-2.c
@@ -41,7 +41,7 @@ typedef int32_t key_serial_t;
 #endif
 
 #include "api_test.h"
-#include "luks.h"
+#include "luks1/luks.h"
 #include "libcryptsetup.h"
 
 #define DMDIR "/dev/mapper/"
diff --git a/tests/api-test.c b/tests/api-test.c
index bb63f44a..08ab681b 100644
--- a/tests/api-test.c
+++ b/tests/api-test.c
@@ -31,7 +31,7 @@
 #include <sys/types.h>
 
 #include "api_test.h"
-#include "luks.h"
+#include "luks1/luks.h"
 #include "libcryptsetup.h"
 
 #define DMDIR "/dev/mapper/"
diff --git a/tests/crypto-vectors.c b/tests/crypto-vectors.c
index f438cd11..9a51c842 100644
--- a/tests/crypto-vectors.c
+++ b/tests/crypto-vectors.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include "crypto_backend.h"
+#include "crypto_backend/crypto_backend.h"
 
 #ifndef ARRAY_SIZE
 # define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))