diff options
| -rw-r--r-- | apps/nc/Makefile.am | 8 | ||||
| -rw-r--r-- | crypto/Makefile.am | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/apps/nc/Makefile.am b/apps/nc/Makefile.am index d678f1e..58b5c01 100644 --- a/apps/nc/Makefile.am +++ b/apps/nc/Makefile.am | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | include $(top_srcdir)/Makefile.am.common | 1 | include $(top_srcdir)/Makefile.am.common |
| 2 | 2 | ||
| 3 | -include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk | ||
| 4 | |||
| 3 | if BUILD_NC | 5 | if BUILD_NC |
| 4 | 6 | ||
| 5 | if ENABLE_NC | 7 | if ENABLE_NC |
| @@ -12,11 +14,13 @@ endif | |||
| 12 | EXTRA_DIST = nc.1 | 14 | EXTRA_DIST = nc.1 |
| 13 | EXTRA_DIST += CMakeLists.txt | 15 | EXTRA_DIST += CMakeLists.txt |
| 14 | 16 | ||
| 15 | nc_LDFLAGS = $(abs_top_builddir)/crypto/.libs/libcrypto.a | ||
| 16 | |||
| 17 | nc_LDADD = $(abs_top_builddir)/tls/libtls.la | 17 | nc_LDADD = $(abs_top_builddir)/tls/libtls.la |
| 18 | nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD) | 18 | nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD) |
| 19 | 19 | ||
| 20 | nc_LDADD += $(libcrypto_la_objects) | ||
| 21 | nc_LDADD += $(libcompat_la_objects) | ||
| 22 | nc_LDADD += $(libcompatnoopt_la_objects) | ||
| 23 | |||
| 20 | AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat | 24 | AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat |
| 21 | 25 | ||
| 22 | nc_SOURCES = atomicio.c | 26 | nc_SOURCES = atomicio.c |
diff --git a/crypto/Makefile.am b/crypto/Makefile.am index 97a84e1..e32ca96 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am | |||
| @@ -99,10 +99,10 @@ libcrypto_la_objects.mk: Makefile | |||
| 99 | | sed 's/ */ $$\(abs_top_builddir\)\/crypto\//g' \ | 99 | | sed 's/ */ $$\(abs_top_builddir\)\/crypto\//g' \ |
| 100 | > libcrypto_la_objects.mk | 100 | > libcrypto_la_objects.mk |
| 101 | @echo "libcompat_la_objects= $(libcompat_la_OBJECTS)" \ | 101 | @echo "libcompat_la_objects= $(libcompat_la_OBJECTS)" \ |
| 102 | | sed 's/ */ $$\(abs_top_builddir\)\/crypto\//g' \ | 102 | | sed 's/compat\// $$\(abs_top_builddir\)\/crypto\/&/g' \ |
| 103 | >> libcrypto_la_objects.mk | 103 | >> libcrypto_la_objects.mk |
| 104 | @echo "libcompatnoopt_la_objects= $(libcompatnoopt_la_OBJECTS)" \ | 104 | @echo "libcompatnoopt_la_objects= $(libcompatnoopt_la_OBJECTS)" \ |
| 105 | | sed 's/ */ $$\(abs_top_builddir\)\/crypto\//g' \ | 105 | | sed 's/compat\// $$\(abs_top_builddir\)\/crypto\/&/g' \ |
| 106 | >> libcrypto_la_objects.mk | 106 | >> libcrypto_la_objects.mk |
| 107 | 107 | ||
| 108 | libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined -export-symbols crypto_portable.sym | 108 | libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined -export-symbols crypto_portable.sym |
