link internal apps statically

This commit is contained in:
Brent Cook 2022-12-18 22:10:11 -06:00
parent f8ced390cd
commit a316f8ab8c
3 changed files with 23 additions and 9 deletions

View File

@ -1,6 +1,8 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
-include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk -include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk
-include $(abs_top_builddir)/ssl/libssl_la_objects.mk
-include $(abs_top_builddir)/tls/libtls_la_objects.mk
if BUILD_NC if BUILD_NC
@ -14,12 +16,13 @@ endif
EXTRA_DIST = nc.1 EXTRA_DIST = nc.1
EXTRA_DIST += CMakeLists.txt EXTRA_DIST += CMakeLists.txt
nc_LDADD = $(abs_top_builddir)/tls/libtls.la nc_LDADD = $(libcrypto_la_objects)
nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)
nc_LDADD += $(libcrypto_la_objects)
nc_LDADD += $(libcompat_la_objects) nc_LDADD += $(libcompat_la_objects)
nc_LDADD += $(libcompatnoopt_la_objects) nc_LDADD += $(libcompatnoopt_la_objects)
nc_LDADD += $(libssl_la_objects)
nc_LDADD += $(libtls_la_objects)
nc_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)
AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat AM_CPPFLAGS += -I$(top_srcdir)/apps/nc/compat

View File

@ -1,5 +1,9 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
-include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk
-include $(abs_top_builddir)/ssl/libssl_la_objects.mk
-include $(abs_top_builddir)/tls/libtls_la_objects.mk
if !ENABLE_LIBTLS_ONLY if !ENABLE_LIBTLS_ONLY
bin_PROGRAMS = ocspcheck bin_PROGRAMS = ocspcheck
dist_man_MANS = ocspcheck.8 dist_man_MANS = ocspcheck.8
@ -10,9 +14,11 @@ endif
EXTRA_DIST = ocspcheck.8 EXTRA_DIST = ocspcheck.8
EXTRA_DIST += CMakeLists.txt EXTRA_DIST += CMakeLists.txt
ocspcheck_LDADD = $(abs_top_builddir)/crypto/libcrypto.la ocspcheck_LDADD = $(libcrypto_la_objects)
ocspcheck_LDADD += $(abs_top_builddir)/ssl/libssl.la ocspcheck_LDADD += $(libcompat_la_objects)
ocspcheck_LDADD += $(abs_top_builddir)/tls/libtls.la ocspcheck_LDADD += $(libcompatnoopt_la_objects)
ocspcheck_LDADD += $(libssl_la_objects)
ocspcheck_LDADD += $(libtls_la_objects)
ocspcheck_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD) ocspcheck_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)
ocspcheck_SOURCES = http.c ocspcheck_SOURCES = http.c

View File

@ -1,5 +1,8 @@
include $(top_srcdir)/Makefile.am.common include $(top_srcdir)/Makefile.am.common
-include $(abs_top_builddir)/crypto/libcrypto_la_objects.mk
-include $(abs_top_builddir)/ssl/libssl_la_objects.mk
if !ENABLE_LIBTLS_ONLY if !ENABLE_LIBTLS_ONLY
bin_PROGRAMS = openssl bin_PROGRAMS = openssl
dist_man_MANS = openssl.1 dist_man_MANS = openssl.1
@ -7,8 +10,10 @@ else
noinst_PROGRAMS = openssl noinst_PROGRAMS = openssl
endif endif
openssl_LDADD = $(abs_top_builddir)/ssl/libssl.la openssl_LDADD = $(libcrypto_la_objects)
openssl_LDADD += $(abs_top_builddir)/crypto/libcrypto.la openssl_LDADD += $(libcompat_la_objects)
openssl_LDADD += $(libcompatnoopt_la_objects)
openssl_LDADD += $(libssl_la_objects)
openssl_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD) openssl_LDADD += $(PLATFORM_LDADD) $(PROG_LDADD)
openssl_SOURCES = apps.c openssl_SOURCES = apps.c