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
39205f2b
Commit
39205f2b
authored
Jan 24, 2018
by
Jay Foad
Committed by
Niels Möller
Jan 24, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix parallel make failures trying to build desdata twice simultaneously.
parent
215ed332
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
7 deletions
+12
-7
Makefile.in
Makefile.in
+12
-7
No files found.
Makefile.in
View file @
39205f2b
...
...
@@ -34,10 +34,7 @@ getopt_TARGETS = $(getopt_SOURCES:.c=.$(OBJEXT))
internal_SOURCES
=
nettle-internal.c
internal_TARGETS
=
$
(
internal_SOURCES:.c
=
.
$(OBJEXT)
)
TARGETS
=
aesdata
$(EXEEXT_FOR_BUILD)
desdata
$(EXEEXT_FOR_BUILD)
\
twofishdata
$(EXEEXT_FOR_BUILD)
shadata
$(EXEEXT_FOR_BUILD)
\
gcmdata
$(EXEEXT_FOR_BUILD)
\
$(getopt_TARGETS)
$(internal_TARGETS)
\
TARGETS
=
$(getopt_TARGETS)
$(internal_TARGETS)
\
$(LIBTARGETS)
$(SHLIBTARGETS)
DOCTARGETS
=
@IF_DOCUMENTATION@ nettle.info nettle.html nettle.pdf
...
...
@@ -224,7 +221,7 @@ DISTFILES = $(SOURCES) $(HEADERS) getopt.h getopt_int.h \
README CONTRIBUTING.md AUTHORS COPYING.LESSERv3 COPYINGv2 COPYINGv3
\
INSTALL NEWS TODO ChangeLog
\
nettle.pc.in hogweed.pc.in
\
$(des_headers)
descore.README
\
$(des_headers)
descore.README
desdata.stamp
\
aes-internal.h camellia-internal.h serpent-internal.h
\
cast128_sboxes.h desinfo.h desCode.h
\
memxor-internal.h nettle-internal.h nettle-write.h
\
...
...
@@ -311,12 +308,15 @@ eccdata$(EXEEXT_FOR_BUILD): eccdata.c mini-gmp.c mini-gmp.h
des_headers
=
rotors.h keymap.h
# Generate DES headers.
$(des_headers)
:
desdata.c
$(MAKE)
desdata
$(EXEEXT_FOR_BUILD)
$(des_headers)
:
desdata.stamp
f
=
"
$(srcdir)
/
`
basename
$@
`
"
;
\
./desdata
$(EXEEXT_FOR_BUILD)
$
(
@F
)
>
$
${f}
T
;
\
test
-s
$
${f}
T
&&
mv
-f
$
${f}
T
$$
f
desdata.stamp
:
desdata.c
$(MAKE)
desdata
$(EXEEXT_FOR_BUILD)
echo
stamp
>
desdata.stamp
des.$(OBJEXT)
:
des.c des.h $(des_headers)
# Generate ECC files.
...
...
@@ -627,6 +627,11 @@ distcheck: dist
clean-here
:
-
rm
-f
$(TARGETS)
*
.
$(OBJEXT)
*
.s
*
.so
*
.dll
*
.a
\
ecc-192.h ecc-224.h ecc-256.h ecc-384.h ecc-521.h ecc-25519.h
\
aesdata
$(EXEEXT_FOR_BUILD)
\
desdata
$(EXEEXT_FOR_BUILD)
desdata.stamp
\
twofishdata
$(EXEEXT_FOR_BUILD)
\
shadata
$(EXEEXT_FOR_BUILD)
\
gcmdata
$(EXEEXT_FOR_BUILD)
\
eccdata
$(EXEEXT_FOR_BUILD)
eccdata.stamp
-
rm
-rf
.lib libnettle.stamp libhogweed.stamp
...
...
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