Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nettle
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Wim Lewis
nettle
Commits
e649a481
Commit
e649a481
authored
Sep 18, 2013
by
Niels Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed link dependency problems with --disable-static.
parent
a0ac8543
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
9 deletions
+24
-9
ChangeLog
ChangeLog
+11
-0
Makefile.in
Makefile.in
+5
-1
examples/Makefile.in
examples/Makefile.in
+2
-2
testsuite/Makefile.in
testsuite/Makefile.in
+1
-1
tools/Makefile.in
tools/Makefile.in
+5
-5
No files found.
ChangeLog
View file @
e649a481
2013-09-18 Niels Möller <nisse@lysator.liu.se>
* Makefile.in: New stampfiles, libnettle.stamp and
libhogweed.stamp, updated when both static and shared libraries
are rebuilt. Used as link dependencies in subdirectories.
* examples/Makefile.in: Make executable targets depend on
../libnettle.stamp and libhogweed.stamp, not directly on the
static library files.
* testsuite/Makefile.in: Likewise.
* tools/Makefile.in: Likewise.
2013-09-09 Niels Möller <nisse@lysator.liu.se>
* gcm.c [HAVE_NATIVE_gcm_gf_mul_8]: Make use of (optional)
...
...
Makefile.in
View file @
e649a481
...
...
@@ -190,11 +190,13 @@ libnettle.a: $(nettle_OBJS)
-
rm
-f
$@
$(AR)
$(ARFLAGS)
$@
$(nettle_OBJS)
$(RANLIB)
$@
echo
nettle
>
libnettle.stamp
libhogweed.a
:
$(hogweed_OBJS)
-
rm
-f
$@
$(AR)
$(ARFLAGS)
$@
$(hogweed_OBJS)
$(RANLIB)
$@
echo
hogweed
>
libhogweed.stamp
.c.$(OBJEXT)
:
$(COMPILE)
$(CCPIC_MAYBE)
-c
$<
\
...
...
@@ -210,6 +212,7 @@ $(LIBNETTLE_FORLINK): $(nettle_PURE_OBJS)
&&
[
-z
"
$(LIBNETTLE_SONAME)
"
]
\
||
{
rm
-f
$(LIBNETTLE_SONAME)
\
&&
$(LN_S)
$(LIBNETTLE_FORLINK)
$(LIBNETTLE_SONAME)
;
}
)
echo
nettle
>
libnettle.stamp
$(LIBHOGWEED_FORLINK)
:
$(hogweed_PURE_OBJS) $(LIBNETTLE_FORLINK)
$(LIBHOGWEED_LINK)
$(hogweed_PURE_OBJS)
-o
$@
$(LIBHOGWEED_LIBS)
...
...
@@ -220,6 +223,7 @@ $(LIBHOGWEED_FORLINK): $(hogweed_PURE_OBJS) $(LIBNETTLE_FORLINK)
&&
[
-z
"
$(LIBHOGWEED_SONAME)
"
]
\
||
{
rm
-f
$(LIBHOGWEED_SONAME)
\
&&
$(LN_S)
$(LIBHOGWEED_FORLINK)
$(LIBHOGWEED_SONAME)
;
}
)
echo
hogweed
>
libhogweed.stamp
.c.p$(OBJEXT)
:
$(COMPILE)
$(SHLIBCFLAGS)
-c
$<
-o
$@
\
...
...
@@ -577,7 +581,7 @@ clean-here:
-
rm
-f
$(TARGETS)
$(IMPLICIT_TARGETS)
*
.
$(OBJEXT)
*
.p
$(OBJEXT)
*
.s
\
ecc-192.h ecc-224.h ecc-256.h ecc-384.h ecc-521.h
\
eccdata
$(EXEEXT_FOR_BUILD)
eccdata.stamp
-
rm
-rf
.lib
-
rm
-rf
.lib
libnettle.stamp libhogweed.stamp
distclean-here
:
clean-here
-
rm
-f
config.h stamp-h config.log config.status machine.m4
\
...
...
examples/Makefile.in
View file @
e649a481
...
...
@@ -117,8 +117,8 @@ hogweed-benchmark$(EXEEXT): $(HOGWEED_BENCH_OBJS)
-lhogweed
-lnettle
$(BENCH_LIBS)
$(LIBS)
$(OPENSSL_LIBFLAGS)
\
-o
hogweed-benchmark
$(EXEEXT)
$(TARGETS)
:
io.$(OBJEXT) ../libnettle.
a
$(HOGWEED_TARGETS)
:
../libhogweed.
a
$(TARGETS)
:
io.$(OBJEXT) ../libnettle.
stamp
$(HOGWEED_TARGETS)
:
../libhogweed.
stamp
check
:
$(TS_ALL)
LD_LIBRARY_PATH
=
../.lib
PATH
=
"../.lib:
$$
PATH"
srcdir
=
"
$(srcdir)
"
\
...
...
testsuite/Makefile.in
View file @
e649a481
...
...
@@ -96,7 +96,7 @@ test-rules:
include
$(srcdir)/.test-rules.make
$(TARGETS) $(EXTRA_TARGETS)
:
testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT)
\
../libnettle.
a @IF_HOGWEED@ ../libhogweed.a
../libnettle.
stamp @IF_HOGWEED@ ../libhogweed.stamp
# For use as, e.g.,
#
...
...
tools/Makefile.in
View file @
e649a481
...
...
@@ -36,23 +36,23 @@ SOURCES = $(sexp_conv_SOURCES) nettle-hash.c nettle-lfib-stream.c pkcs1-conv.c
DISTFILES
=
$(SOURCES)
Makefile.in input.h misc.h output.h parse.h
sexp_conv_OBJS
=
$
(
sexp_conv_SOURCES:.c
=
.
$(OBJEXT)
)
$(getopt_OBJS)
sexp-conv$(EXEEXT)
:
$(sexp_conv_OBJS) ../libnettle.
a
sexp-conv$(EXEEXT)
:
$(sexp_conv_OBJS) ../libnettle.
stamp
$(LINK)
$(sexp_conv_OBJS)
-lnettle
$(LIBS)
-o
$@
nettle-lfib-stream$(EXEEXT)
:
nettle-lfib-stream.$(OBJEXT) ../libnettle.
a
nettle-lfib-stream$(EXEEXT)
:
nettle-lfib-stream.$(OBJEXT) ../libnettle.
stamp
$(LINK)
nettle-lfib-stream.
$(OBJEXT)
-lnettle
$(LIBS)
-o
$@
pkcs1_conv_OBJS
=
$
(
pkcs1_conv_SOURCES:.c
=
.
$(OBJEXT)
)
$(getopt_OBJS)
pkcs1-conv$(EXEEXT)
:
$(pkcs1_conv_OBJS) ../libnettle.
a ../libhogweed.a
pkcs1-conv$(EXEEXT)
:
$(pkcs1_conv_OBJS) ../libnettle.
stamp ../libhogweed.stamp
$(LINK)
$(pkcs1_conv_OBJS)
-lhogweed
-lnettle
$(LIBS)
-o
$@
# FIXME: Avoid linking with gmp
nettle_hash_OBJS
=
$
(
nettle_hash_SOURCES:.c
=
.
$(OBJEXT)
)
$(getopt_OBJS)
nettle-hash$(EXEEXT)
:
$(nettle_hash_OBJS) ../libnettle.
a
nettle-hash$(EXEEXT)
:
$(nettle_hash_OBJS) ../libnettle.
stamp
$(LINK)
$(nettle_hash_OBJS)
-lnettle
-o
$@
nettle_pbkdf2_OBJS
=
$
(
nettle_pbkdf2_SOURCES:.c
=
.
$(OBJEXT)
)
$(getopt_OBJS)
nettle-pbkdf2$(EXEEXT)
:
$(nettle_pbkdf2_OBJS) ../libnettle.
a
nettle-pbkdf2$(EXEEXT)
:
$(nettle_pbkdf2_OBJS) ../libnettle.
stamp
$(LINK)
$(nettle_pbkdf2_OBJS)
-lnettle
-o
$@
...
...
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