Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Nettle
nettle
Commits
75b7234d
Commit
75b7234d
authored
Sep 20, 2012
by
Niels Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dependency tracking also for C++ files.
parent
17c2ee26
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
10 deletions
+23
-10
ChangeLog
ChangeLog
+8
-0
configure.ac
configure.ac
+4
-4
testsuite/Makefile.in
testsuite/Makefile.in
+11
-6
No files found.
ChangeLog
View file @
75b7234d
2012-09-20 Niels Möller <nisse@lysator.liu.se>
* configure.ac: New substitution IF_CXX, replacing CXX_TESTS.
(dummy-dep-files): Handle .cxx files.
* testsuite/Makefile.in: Use IF_CXX. Include dependency file for
cxx-test.o.
2012-09-19 Niels Möller <nisse@lysator.liu.se>
From Tim Rühsen:
...
...
configure.ac
View file @
75b7234d
...
...
@@ -91,8 +91,8 @@ fi
AC_PROG_CXX
AC_LANG_PUSH(C++)
AC_TRY_COMPILE([],[return 0;],[
CXX_TESTS='cxx-test$(EXEEXT)'], [CXX_TESTS
=''])
AC_SUBST([CXX
_TESTS
])
AC_TRY_COMPILE([],[return 0;],[
IF_CXX=''], [IF_CXX
='
#
'])
AC_SUBST([
IF_
CXX])
AC_LANG_POP
AC_PROG_MAKE_SET
...
...
@@ -121,8 +121,8 @@ if test x$enable_dependency_tracking = xyes ; then
# actually needed.
AC_CONFIG_COMMANDS([dummy-dep-files],
[(cd "$srcdir" && find . -name '*.c' -print) \
| sed 's/\.c$//' | (while read f; do echo > "$f.o.d"; echo > "$f.po.d"; done)
[(cd "$srcdir" && find .
'('
-name '*.c'
-o -name '*.cxx' ')'
-print) \
| sed 's/\.c
\(xx\|\)
$//' | (while read f; do echo > "$f.o.d"; echo > "$f.po.d"; done)
])
fi
...
...
testsuite/Makefile.in
View file @
75b7234d
...
...
@@ -35,20 +35,24 @@ TS_HOGWEED_SOURCES = sexp-test.c sexp-format-test.c \
dsa-test.c dsa-keygen-test.c
TS_SOURCES
=
$(TS_NETTLE_SOURCES)
@IF_HOGWEED@
$(TS_HOGWEED_SOURCES)
CXX_SOURCES
=
@IF_CXX@ cxx-test.cxx
TS_NETTLE
=
$
(
TS_NETTLE_SOURCES:.c
=
$(EXEEXT)
)
TS_HOGWEED
=
$
(
TS_HOGWEED_SOURCES:.c
=
$(EXEEXT)
)
TS_C
=
$(TS_NETTLE)
@IF_HOGWEED@
$(TS_HOGWEED)
TS_CXX
=
@
CXX_
TESTS@
TS_CXX
=
$
(
CXX_
SOURCES:.cxx
=
$(EXEEXT)
)
TARGETS
=
$(TS_C)
$(TS_CXX)
TS_SH
=
sexp-conv-test pkcs1-conv-test symbols-test
TS_ALL
=
$(TARGETS)
$(TS_SH)
EXTRA_SOURCES
=
sha1-huge-test.c
EXTRA_TARGETS
=
$
(
EXTRA_SOURCES:.c
=
$(EXEEXT)
)
SOURCES
=
$(TS_SOURCES)
testutils.c
# C source files to be built
SOURCES
=
$(TS_SOURCES)
$(EXTRA_SOURCES)
testutils.c
DISTFILES
=
$(SOURCES)
$(EXTRA_SOURCES)
cxx-test.cxx Makefile.in .test-rules.make
\
# Includes all C source files, regardless of configuration
DISTFILES
=
$(TS_NETTLE_SOURCES)
$(TS_HOGWEED_SOURCES)
\
$(EXTRA_SOURCES)
cxx-test.cxx Makefile.in .test-rules.make
\
$(TS_SH)
setup-env teardown-env
\
gold-bug.txt testutils.h
...
...
@@ -116,4 +120,5 @@ distclean: clean
tags
:
etags
-o
$(srcdir)
/TAGS
--include
$(top_srcdir)
$(srcdir)
/
*
.c
$(srcdir)
/
*
.h
@DEP_INCLUDE@ $(SOURCES
:
.c=.$(OBJEXT).d)
DEP_FILES
=
$
(
SOURCES:.c
=
.
$(OBJEXT)
.d
)
$
(
CXX_SOURCES:.cxx
=
.
$(OBJEXT)
.d
)
@DEP_INCLUDE@
$(DEP_FILES)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment