diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-09-25 16:51:44 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-09-25 16:51:44 +0200 |
| commit | 8ee791268815e56ad4adebe643b0aefe0b034f1e (patch) | |
| tree | 17495d700cb55deb81e4b18623676a57da1a8d78 /extra | |
| parent | 3b70d49d37d5c9f2d25fab06891bfa5bdf34211f (diff) | |
| download | gnutls-8ee791268815e56ad4adebe643b0aefe0b034f1e.tar.gz | |
All external libraries that were in LDFLAGS are moved into LIBADD/LDADD.
It also fixes order within LIBADD/LDADD so that libtool objects go first.
Patch by Bartosz Brachaczek.
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/extra/Makefile.am b/extra/Makefile.am index 98421b0461..8cbb4050cb 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -53,7 +53,7 @@ lib_LTLIBRARIES = libgnutls-openssl.la libgnutls_openssl_la_SOURCES = gnutls_openssl.c openssl_compat.h \ openssl_compat.c -libgnutls_openssl_la_LIBADD = ../gl/libgnu.la $(LIBSOCKET) \ +libgnutls_openssl_la_LIBADD = ../gl/libgnu.la \ ../lib/libgnutls.la libgnutls_openssl_la_LDFLAGS += -version-info $(LT_SSL_CURRENT):$(LT_SSL_REVISION):$(LT_SSL_AGE) @@ -61,9 +61,11 @@ libgnutls_openssl_la_LDFLAGS += -version-info $(LT_SSL_CURRENT):$(LT_SSL_REVISIO if ENABLE_MINITASN1 libgnutls_openssl_la_LIBADD += ../lib/minitasn1/libminitasn1.la else -libgnutls_openssl_la_LDFLAGS += $(LTLIBTASN1) +libgnutls_openssl_la_LIBADD += $(LTLIBTASN1) endif +libgnutls_openssl_la_LIBADD += $(LIBSOCKET) + if HAVE_LD_OUTPUT_DEF libgnutls_openssl_la_LDFLAGS += \ -Wl,--output-def,libgnutls-openssl-$(DLL_VERSION).def |