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
Dmitry Baryshkov
nettle
Commits
3591eb53
Commit
3591eb53
authored
Sep 23, 2004
by
Niels Möller
Browse files
More Cygwin fixes.
Rev: src/nettle/Makefile.am:1.80 Rev: src/nettle/configure.ac:1.43
parent
26e0654c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Makefile.am
View file @
3591eb53
...
...
@@ -138,9 +138,9 @@ SHLIBOBJECTS = $(patsubst %.c,%_p.$(OBJEXT),$(libnettle_a_SOURCES)) \
# The point of the sym links is to use -Lnettle-dir at linktime,
# and LD_LIBRARY_PATH=nettle-dir/.lib at run time.
$(SHLIBFORLINK)
:
$(SHLIBOBJECTS)
$(SHLIBLINK)
$^
-o
$@
$(SHLIBLINK)
$^
-o
$@
$(SHLIBLIBS)
-
mkdir
.lib 2>/dev/null
(
[
-z
"
$(SHLIBSONAME)
"
]
||
cd
.lib
\
[
-z
"
$(SHLIBSONAME)
"
]
||
(
cd
.lib
\
&&
ln
-sf
../
$(SHLIBFORLINK)
$(SHLIBSONAME)
)
endif
...
...
@@ -151,8 +151,8 @@ install-data-local: $(SHLIBINSTALL)
install-shared
:
$(SHLIBFORLINK)
$(INSTALL_DATA)
$(SHLIBFORLINK)
$(DESTDIR)$(libdir)
/
$(SHLIBFILE)
(
[
-z
"
$(SHLIBSONAME)
"
]
\
||
cd
$(DESTDIR)$(libdir)
\
[
-z
"
$(SHLIBSONAME)
"
]
\
||
(
cd
$(DESTDIR)$(libdir)
\
&&
ln
-sf
$(SHLIBFILE)
$(SHLIBSONAME)
\
&&
ln
-sf
$(SHLIBFILE)
$(SHLIBFORLINK)
)
...
...
configure.ac
View file @
3591eb53
...
...
@@ -125,13 +125,16 @@ case `uname -sr` in
SHLIBFORLINK='cygnettle-$(SHLIBMAJOR)-$(SHLIBMINOR).dll'
SHLIBSONAME=''
SHLIBFILE='libnettle.dll.a'
SHLIBLINK='$(CC) $(LDFLAGS) -shared -Wl,--out-implib=$(SHLIBFILE) -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--whole-archive'
SHLIBLINK='$(CC) $(LDFLAGS) -shared -Wl,--out-implib=$(SHLIBFILE) -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--no-whole-archive'
SHLIBLIBS='$(LIBS)'
;;
*)
SHLIBFORLINK=libnettle.so
SHLIBSONAME='$(SHLIBFORLINK).$(SHLIBMAJOR)'
SHLIBFILE='$(SHLIBSONAME).$(SHLIBMINOR)'
SHLIBLINK='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME)'
# FIXME: It might make some sense to link with -lgmp
SHLIBLIBS=''
;;
esac
...
...
@@ -159,7 +162,8 @@ AC_SUBST(SHLIBFILE)
AC_SUBST(SHLIBLINK)
AC_SUBST(SHLIBTARGET)
AC_SUBST(SHLIBINSTALL)
AC_SUBST(SHLIBLIBS)
AC_PATH_PROG(M4, m4, m4)
# Checks for typedefs, structures, and compiler characteristics.
...
...
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