Skip to content

Commit 0bcabf3

Browse files
author
Tilman Keskinöz
committed
buildfix for srcdir != builddir
1 parent aab4709 commit 0bcabf3

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ cppcheck:
6363
--enable=warning,style,performance,portability,unusedFunction,missingInclude \
6464
--inconclusive \
6565
--template="warning: {file},{line},{severity},{id},{message}" \
66-
-I headers -I . -I others -I src -I others/mbedtls/include \
66+
-I headers -I . -I $(top_srcdir)/others -I $(top_srcdir)/src -I $(top_srcdir)/others/mbedtls/include \
6767
--error-exitcode=1 \
6868
-i "src/parser/seclang-parser.cc" -i "src/parser/seclang-scanner.cc" \
6969
-i others \

others/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ libmbedtls_la_SOURCES = \
2828
mbedtls/library/sha1.c \
2929
mbedtls/library/platform_util.c
3030

31-
libmbedtls_la_CFLAGS = -DMBEDTLS_CONFIG_FILE=\"mbedtls/mbedtls_config.h\" -Imbedtls/include
31+
libmbedtls_la_CFLAGS = -DMBEDTLS_CONFIG_FILE=\"mbedtls/mbedtls_config.h\" -I$(top_srcdir)/others/mbedtls/include
3232
libmbedtls_la_CPPFLAGS =
3333
libmbedtls_la_LIBADD =

test/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ unit_tests_LDFLAGS = \
7272

7373
unit_tests_CPPFLAGS = \
7474
-Icommon \
75-
-I../ \
75+
-I$(srcdir)/../ \
7676
-g \
7777
-I$(top_builddir)/headers \
7878
$(CURL_CFLAGS) \
@@ -127,7 +127,7 @@ regression_tests_LDFLAGS = \
127127

128128
regression_tests_CPPFLAGS = \
129129
-Icommon \
130-
-I../ \
130+
-I$(srcdir)../ \
131131
-g \
132132
-I$(top_builddir)/headers \
133133
$(CURL_CFLAGS) \
@@ -179,7 +179,7 @@ rules_optimization_LDFLAGS = \
179179

180180
rules_optimization_CPPFLAGS = \
181181
-Icommon \
182-
-I../ \
182+
-I$(srcdir)/../ \
183183
-g \
184184
-I$(top_builddir)/headers \
185185
$(CURL_CFLAGS) \

0 commit comments

Comments
 (0)