Skip to content

Commit c421108

Browse files
joannalangejoannalange
committed
Add srcdir in Makefile
1 parent f980d1b commit c421108

File tree

7 files changed

+101
-207
lines changed

7 files changed

+101
-207
lines changed

‎Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,13 @@ AM_CPPFLAGS = -std=c++11 \
8282
-Werror \
8383
-Wno-reorder \
8484
$(BOOST_CPPFLAGS) \
85-
-Isrc/
85+
-I$(srcdir)src/
8686

8787
AUTOMAKE_OPTIONS = foreign
8888

8989
if HAVE_CPPCHECK
9090
cppcheck:
9191
$(CPPCHECK) --quiet --std=c++11 --enable=all \
92-
--suppress=missingIncludeSystem src
92+
--suppress=missingIncludeSystem $(srcdir)/src
9393
check: cppcheck
9494
endif

‎Makefile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ AM_CPPFLAGS = -std=c++11 \
417417
-Werror \
418418
-Wno-reorder \
419419
$(BOOST_CPPFLAGS) \
420-
-Isrc/
420+
-I$(srcdir)src/
421421

422422
AUTOMAKE_OPTIONS = foreign
423423
all: config.h
@@ -1007,7 +1007,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS
10071007

10081008
@HAVE_CPPCHECK_TRUE@cppcheck:
10091009
@HAVE_CPPCHECK_TRUE@ $(CPPCHECK) --quiet --std=c++11 --enable=all \
1010-
@HAVE_CPPCHECK_TRUE@ --suppress=missingIncludeSystem src
1010+
@HAVE_CPPCHECK_TRUE@ --suppress=missingIncludeSystem $(srcdir)/src
10111011
@HAVE_CPPCHECK_TRUE@check: cppcheck
10121012

10131013
# Tell versions [3.59,3.63) of GNU make to not export all variables.

‎autom4te.cache/requests

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -34,52 +34,52 @@
3434
'configure.ac'
3535
],
3636
{
37+
'AM_AUX_DIR_EXPAND' => 1,
3738
'AM_SET_DEPDIR' => 1,
38-
'AM_MAKE_INCLUDE' => 1,
39-
'AX_BOOST_REGEX' => 1,
40-
'AC_DEFUN' => 1,
41-
'_m4_warn' => 1,
42-
'AC_CONFIG_MACRO_DIR' => 1,
43-
'include' => 1,
44-
'AX_BOOST_UNIT_TEST_FRAMEWORK' => 1,
45-
'AM_INIT_AUTOMAKE' => 1,
39+
'_AM_SET_OPTION' => 1,
40+
'AX_BOOST_FILESYSTEM' => 1,
41+
'AX_BOOST_PROGRAM_OPTIONS' => 1,
42+
'_AM_DEPENDENCIES' => 1,
43+
'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
44+
'm4_include' => 1,
45+
'_AM_IF_OPTION' => 1,
46+
'AM_MISSING_PROG' => 1,
47+
'AM_SUBST_NOTMAKE' => 1,
4648
'AM_CONDITIONAL' => 1,
49+
'_AM_CONFIG_MACRO_DIRS' => 1,
50+
'AC_CONFIG_MACRO_DIR_TRACE' => 1,
4751
'AM_SET_LEADING_DOT' => 1,
48-
'AM_MISSING_PROG' => 1,
49-
'm4_pattern_forbid' => 1,
52+
'm4_pattern_allow' => 1,
53+
'_AM_AUTOCONF_VERSION' => 1,
54+
'_AM_MANGLE_OPTION' => 1,
55+
'AM_DEP_TRACK' => 1,
56+
'AC_DEFUN_ONCE' => 1,
57+
'AX_BOOST_BASE' => 1,
58+
'_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
59+
'AC_DEFUN' => 1,
5060
'_AM_SUBST_NOTMAKE' => 1,
51-
'AM_MISSING_HAS_RUN' => 1,
52-
'AM_AUTOMAKE_VERSION' => 1,
61+
'AM_RUN_LOG' => 1,
62+
'AX_BOOST_REGEX' => 1,
63+
'_m4_warn' => 1,
64+
'include' => 1,
5365
'AM_PROG_CC_C_O' => 1,
54-
'AM_PROG_INSTALL_STRIP' => 1,
55-
'AM_PROG_INSTALL_SH' => 1,
56-
'AX_BOOST_PROGRAM_OPTIONS' => 1,
57-
'_AM_SET_OPTIONS' => 1,
58-
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
59-
'AM_AUX_DIR_EXPAND' => 1,
66+
'AM_AUTOMAKE_VERSION' => 1,
67+
'AM_INIT_AUTOMAKE' => 1,
6068
'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
61-
'AC_DEFUN_ONCE' => 1,
62-
'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
63-
'AX_BOOST_FILESYSTEM' => 1,
64-
'_AM_IF_OPTION' => 1,
65-
'_AM_DEPENDENCIES' => 1,
66-
'AM_SILENT_RULES' => 1,
6769
'AX_BOOST_SYSTEM' => 1,
68-
'm4_include' => 1,
69-
'_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
70-
'_AM_MANGLE_OPTION' => 1,
71-
'm4_pattern_allow' => 1,
72-
'AX_BOOST_BASE' => 1,
73-
'_AM_CONFIG_MACRO_DIRS' => 1,
70+
'AU_DEFUN' => 1,
71+
'AM_SILENT_RULES' => 1,
72+
'm4_pattern_forbid' => 1,
73+
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
7474
'AM_SANITY_CHECK' => 1,
75+
'AC_CONFIG_MACRO_DIR' => 1,
76+
'_AM_SET_OPTIONS' => 1,
77+
'AM_PROG_INSTALL_STRIP' => 1,
78+
'AM_MAKE_INCLUDE' => 1,
79+
'AM_MISSING_HAS_RUN' => 1,
80+
'AX_BOOST_UNIT_TEST_FRAMEWORK' => 1,
7581
'_AM_PROG_CC_C_O' => 1,
76-
'AM_RUN_LOG' => 1,
77-
'AC_CONFIG_MACRO_DIR_TRACE' => 1,
78-
'AM_DEP_TRACK' => 1,
79-
'AM_SUBST_NOTMAKE' => 1,
80-
'AU_DEFUN' => 1,
81-
'_AM_AUTOCONF_VERSION' => 1,
82-
'_AM_SET_OPTION' => 1,
82+
'AM_PROG_INSTALL_SH' => 1,
8383
'_AM_PROG_TAR' => 1
8484
}
8585
], 'Autom4te::Request' ),
@@ -95,65 +95,65 @@
9595
'configure.ac'
9696
],
9797
{
98-
'AM_SILENT_RULES' => 1,
99-
'LT_CONFIG_LTDL_DIR' => 1,
100-
'm4_include' => 1,
101-
'm4_sinclude' => 1,
102-
'AC_INIT' => 1,
103-
'AC_CONFIG_FILES' => 1,
104-
'AC_CONFIG_AUX_DIR' => 1,
98+
'AM_XGETTEXT_OPTION' => 1,
99+
'AC_FC_PP_SRCEXT' => 1,
100+
'AC_CANONICAL_TARGET' => 1,
101+
'AM_PROG_MOC' => 1,
102+
'AM_PROG_CXX_C_O' => 1,
105103
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
106-
'AM_PROG_FC_C_O' => 1,
107-
'AC_SUBST_TRACE' => 1,
108-
'AC_CONFIG_HEADERS' => 1,
109-
'_AM_COND_ENDIF' => 1,
110-
'AC_CANONICAL_BUILD' => 1,
111104
'AM_PROG_F77_C_O' => 1,
112-
'AM_EXTRA_RECURSIVE_TARGETS' => 1,
113-
'AC_SUBST' => 1,
114-
'AM_PROG_CXX_C_O' => 1,
105+
'AC_REQUIRE_AUX_FILE' => 1,
106+
'_AM_COND_ELSE' => 1,
107+
'AC_FC_FREEFORM' => 1,
108+
'AC_CONFIG_HEADERS' => 1,
109+
'_LT_AC_TAGCONFIG' => 1,
110+
'AM_PATH_GUILE' => 1,
115111
'AM_MAKEFILE_INCLUDE' => 1,
112+
'AC_PROG_LIBTOOL' => 1,
113+
'AH_OUTPUT' => 1,
114+
'AC_CANONICAL_SYSTEM' => 1,
115+
'AC_CONFIG_LINKS' => 1,
116+
'AM_POT_TOOLS' => 1,
117+
'm4_include' => 1,
116118
'AC_CONFIG_SUBDIRS' => 1,
117-
'AC_FC_FREEFORM' => 1,
118-
'AM_PROG_AR' => 1,
119+
'_AM_COND_ENDIF' => 1,
120+
'LT_CONFIG_LTDL_DIR' => 1,
119121
'LT_SUPPORTED_TAG' => 1,
120-
'AC_FC_PP_SRCEXT' => 1,
122+
'AC_SUBST_TRACE' => 1,
123+
'_AM_COND_IF' => 1,
124+
'AM_PROG_AR' => 1,
125+
'AC_INIT' => 1,
126+
'AM_NLS' => 1,
121127
'm4_pattern_allow' => 1,
122-
'AM_POT_TOOLS' => 1,
123-
'AC_FC_SRCEXT' => 1,
124128
'AM_MAINTAINER_MODE' => 1,
125-
'AM_XGETTEXT_OPTION' => 1,
126-
'_AM_COND_ELSE' => 1,
127-
'_m4_warn' => 1,
128-
'include' => 1,
129-
'LT_INIT' => 1,
130-
'AC_CANONICAL_HOST' => 1,
131-
'AC_PROG_LIBTOOL' => 1,
132-
'AM_INIT_AUTOMAKE' => 1,
133129
'AM_CONDITIONAL' => 1,
130+
'LT_INIT' => 1,
131+
'AC_CONFIG_FILES' => 1,
132+
'AM_PROG_MKDIR_P' => 1,
133+
'AM_EXTRA_RECURSIVE_TARGETS' => 1,
134134
'_AM_MAKEFILE_INCLUDE' => 1,
135-
'AC_CONFIG_LIBOBJ_DIR' => 1,
136-
'AM_PATH_GUILE' => 1,
137-
'_LT_AC_TAGCONFIG' => 1,
138-
'AC_CANONICAL_SYSTEM' => 1,
139-
'AM_PROG_MOC' => 1,
135+
'AM_GNU_GETTEXT' => 1,
136+
'AC_CONFIG_AUX_DIR' => 1,
137+
'AC_CANONICAL_BUILD' => 1,
138+
'AC_CANONICAL_HOST' => 1,
140139
'AC_DEFINE_TRACE_LITERAL' => 1,
141-
'AM_PROG_MKDIR_P' => 1,
140+
'AC_LIBSOURCE' => 1,
141+
'AM_ENABLE_MULTILIB' => 1,
142+
'AM_PROG_FC_C_O' => 1,
143+
'include' => 1,
144+
'AM_PROG_CC_C_O' => 1,
145+
'm4_sinclude' => 1,
146+
'_m4_warn' => 1,
147+
'AC_FC_SRCEXT' => 1,
148+
'AC_SUBST' => 1,
149+
'AM_AUTOMAKE_VERSION' => 1,
142150
'sinclude' => 1,
143-
'AM_GNU_GETTEXT' => 1,
144151
'AC_FC_PP_DEFINE' => 1,
145-
'AM_PROG_CC_C_O' => 1,
146-
'AH_OUTPUT' => 1,
147-
'AC_CANONICAL_TARGET' => 1,
148-
'AM_NLS' => 1,
149-
'AC_REQUIRE_AUX_FILE' => 1,
150-
'_AM_COND_IF' => 1,
151-
'AM_ENABLE_MULTILIB' => 1,
152-
'AC_CONFIG_LINKS' => 1,
153152
'_AM_SUBST_NOTMAKE' => 1,
154153
'm4_pattern_forbid' => 1,
155-
'AM_AUTOMAKE_VERSION' => 1,
156-
'AC_LIBSOURCE' => 1
154+
'AM_SILENT_RULES' => 1,
155+
'AM_INIT_AUTOMAKE' => 1,
156+
'AC_CONFIG_LIBOBJ_DIR' => 1
157157
}
158158
], 'Autom4te::Request' )
159159
);

0 commit comments

Comments
 (0)