Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Wim Lewis
nettle
Commits
cc2a3f8a
Commit
cc2a3f8a
authored
Jun 07, 2017
by
Niels Möller
Browse files
Rework make targets related to test-rules.
parent
7815864d
Changes
3
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
cc2a3f8a
2017-05-23 Niels Möller <nisse@lysator.liu.se>
Rework the previous change, which had the unintended effect of
always regenerating .test-rules.make after ./configure is run.
* testsuite/Makefile.in (test-rules.stamp): New stamp file target,
depend on Makefile.in, and run $(MAKE) test-rules.
(.test-rules.make): Add a level of indirection, by depending on
test-rules.stamp.
2017-05-20 Niels Möller <nisse@lysator.liu.se>
* testsuite/Makefile.in (test-rules): Use $(srddir)/-prefix for
...
...
testsuite/Makefile.in
View file @
cc2a3f8a
...
...
@@ -67,6 +67,7 @@ EXTRA_TARGETS = $(EXTRA_SOURCES:.c=$(EXEEXT))
SOURCES
=
$(TS_SOURCES)
$(EXTRA_SOURCES)
testutils.c dlopen-test.c
DISTFILES
=
$(SOURCES)
$(CXX_SOURCES)
Makefile.in .test-rules.make
\
test-rules.stamp
\
$(TS_SH)
setup-env teardown-env
\
gold-bug.txt testutils.h sha3.awk
...
...
@@ -96,9 +97,7 @@ dlopen-test$(EXEEXT): dlopen-test.$(OBJEXT) testutils.$(OBJEXT)
$(LINK)
dlopen-test.
$(OBJEXT)
-ldl
-o
dlopen-test
$(EXEEXT)
.PHONY
:
test-rules
test-rules
:
$(srcdir)/.test-rules.make
$(srcdir)/.test-rules.make
:
Makefile
test-rules
:
(
for
f
in
$(TS_NETTLE)
$(TS_HOGWEED)
$(EXTRA_TARGETS)
;
do
\
echo
$$
f
'$
$(EXEEXT)
: '
$$
f
'.$
$(OBJEXT)
'
;
\
echo
' $
$(LINK)
'
$$
f
'.$
$(OBJEXT)
$
$(TEST_OBJS)
-o '
$$
f
'$
$(EXEEXT)
'
;
\
...
...
@@ -109,10 +108,14 @@ $(srcdir)/.test-rules.make: Makefile
echo
' $
$(LINK_CXX)
'
$$
f
'.$
$(OBJEXT)
$
$(TEST_OBJS)
-o '
$$
f
'$
$(EXEEXT)
'
;
\
echo
;
\
done
)
>
$(srcdir)
/.test-rules.make
@
echo
"******************************************************************"
@
echo
"testsuite Makefile rules have been regenerated; please re-run make"
@
echo
"******************************************************************"
false
$(srcdir)/.test-rules.make
:
$(srcdir)/test-rules.stamp
# Updates the stamp file *first*, so that this rule isn't triggered
# again and again by the recursive $(MAKE).
$(srcdir)/test-rules.stamp
:
Makefile.in
echo
stamp
>
$(srcdir)
/test-rules.stamp
$(MAKE)
test-rules
include
$(srcdir)/.test-rules.make
...
...
testsuite/test-rules.stamp
0 → 100644
View file @
cc2a3f8a
stamp
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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