From 0bcabf3208e0c840044b4f1df3ba6a74de2a2bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tilman=20Keskin=C3=B6z?= Date: Thu, 22 May 2025 18:59:51 +0200 Subject: [PATCH] buildfix for srcdir != builddir --- Makefile.am | 2 +- others/Makefile.am | 2 +- test/Makefile.am | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4468ba71..7ac184b5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,7 +63,7 @@ cppcheck: --enable=warning,style,performance,portability,unusedFunction,missingInclude \ --inconclusive \ --template="warning: {file},{line},{severity},{id},{message}" \ - -I headers -I . -I others -I src -I others/mbedtls/include \ + -I headers -I . -I $(top_srcdir)/others -I $(top_srcdir)/src -I $(top_srcdir)/others/mbedtls/include \ --error-exitcode=1 \ -i "src/parser/seclang-parser.cc" -i "src/parser/seclang-scanner.cc" \ -i others \ diff --git a/others/Makefile.am b/others/Makefile.am index 956c8d90..b102a033 100644 --- a/others/Makefile.am +++ b/others/Makefile.am @@ -28,6 +28,6 @@ libmbedtls_la_SOURCES = \ mbedtls/library/sha1.c \ mbedtls/library/platform_util.c -libmbedtls_la_CFLAGS = -DMBEDTLS_CONFIG_FILE=\"mbedtls/mbedtls_config.h\" -Imbedtls/include +libmbedtls_la_CFLAGS = -DMBEDTLS_CONFIG_FILE=\"mbedtls/mbedtls_config.h\" -I$(top_srcdir)/others/mbedtls/include libmbedtls_la_CPPFLAGS = libmbedtls_la_LIBADD = diff --git a/test/Makefile.am b/test/Makefile.am index 2c1ba02a..971d9739 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -72,7 +72,7 @@ unit_tests_LDFLAGS = \ unit_tests_CPPFLAGS = \ -Icommon \ - -I../ \ + -I$(srcdir)/../ \ -g \ -I$(top_builddir)/headers \ $(CURL_CFLAGS) \ @@ -127,7 +127,7 @@ regression_tests_LDFLAGS = \ regression_tests_CPPFLAGS = \ -Icommon \ - -I../ \ + -I$(srcdir)../ \ -g \ -I$(top_builddir)/headers \ $(CURL_CFLAGS) \ @@ -179,7 +179,7 @@ rules_optimization_LDFLAGS = \ rules_optimization_CPPFLAGS = \ -Icommon \ - -I../ \ + -I$(srcdir)/../ \ -g \ -I$(top_builddir)/headers \ $(CURL_CFLAGS) \