From 225d5a334fca1a52714f0120d0961236db0f236c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 19 Jun 2005 04:20:27 +0000 Subject: r7742: abstracted out the tls code from the web server, so that our other servers can easily become tls enabled. This will be used to add support for ldaps (This used to be commit 950500f603725349d2a0e22878e83dd1b5975f9f) --- source4/lib/tls/config.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 source4/lib/tls/config.mk (limited to 'source4/lib/tls/config.mk') diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk new file mode 100644 index 0000000000..0800a69829 --- /dev/null +++ b/source4/lib/tls/config.mk @@ -0,0 +1,12 @@ +################################################ +# Start SUBSYSTEM LIBTLS +[SUBSYSTEM::LIBTLS] +ADD_OBJ_FILES = \ + lib/tls/tls.o \ + lib/tls/tlscert.o +REQUIRED_SUBSYSTEMS = \ + LIBTALLOC EXT_LIB_GNUTLS +NOPROTO = YES +# +# End SUBSYSTEM LIBTLS +################################################ -- cgit From 4c5a4a7e0288e9ac0b2f795befd5684059e4c429 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 21 Oct 2005 16:29:54 +0000 Subject: r11244: Relative path names in .mk files (This used to be commit 24e10300906c380919d2d631bfb3b8fd6b3f54ba) --- source4/lib/tls/config.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/lib/tls/config.mk') diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk index 0800a69829..29d458acac 100644 --- a/source4/lib/tls/config.mk +++ b/source4/lib/tls/config.mk @@ -2,8 +2,8 @@ # Start SUBSYSTEM LIBTLS [SUBSYSTEM::LIBTLS] ADD_OBJ_FILES = \ - lib/tls/tls.o \ - lib/tls/tlscert.o + tls.o \ + tlscert.o REQUIRED_SUBSYSTEMS = \ LIBTALLOC EXT_LIB_GNUTLS NOPROTO = YES -- cgit From d8e35f882879e189f55b3bca818dd44cc5f0c6fa Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 26 Dec 2005 18:03:50 +0000 Subject: r12498: Eliminate INIT_OBJ_FILES and ADD_OBJ_FILES. We were not using the difference between these at all, and in the future the fact that INIT_OBJ_FILES include smb_build.h will be sufficient to have recompiles at the right time. (This used to be commit b24f2583edee38abafa58578d8b5c4b43e517def) --- source4/lib/tls/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/tls/config.mk') diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk index 29d458acac..ea1bd5be55 100644 --- a/source4/lib/tls/config.mk +++ b/source4/lib/tls/config.mk @@ -1,7 +1,7 @@ ################################################ # Start SUBSYSTEM LIBTLS [SUBSYSTEM::LIBTLS] -ADD_OBJ_FILES = \ +OBJ_FILES = \ tls.o \ tlscert.o REQUIRED_SUBSYSTEMS = \ -- cgit From 71b4fd97922933b24424924acee606389bfecb2d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 16 Mar 2006 13:56:14 +0000 Subject: r14477: Remove the NOPROTO property - it's no longer used as proto.h is gone. (This used to be commit 9c37f847d32d2f327a88c53a90af0c73126b76be) --- source4/lib/tls/config.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'source4/lib/tls/config.mk') diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk index ea1bd5be55..8e59bb33e5 100644 --- a/source4/lib/tls/config.mk +++ b/source4/lib/tls/config.mk @@ -6,7 +6,6 @@ OBJ_FILES = \ tlscert.o REQUIRED_SUBSYSTEMS = \ LIBTALLOC EXT_LIB_GNUTLS -NOPROTO = YES # # End SUBSYSTEM LIBTLS ################################################ -- cgit From 18cddd580e04344e05593d9f63beb9ead53cfab2 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 20 Mar 2006 00:28:12 +0000 Subject: r14575: Move some path-related functions to libsamba-config so libsamba-util doesn't have to depend on the lp_* functions. (This used to be commit f97df7d90a41b77a9edd2d6bdc47c27bf1b6bb07) --- source4/lib/tls/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/tls/config.mk') diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk index 8e59bb33e5..810dc17d2d 100644 --- a/source4/lib/tls/config.mk +++ b/source4/lib/tls/config.mk @@ -5,7 +5,7 @@ OBJ_FILES = \ tls.o \ tlscert.o REQUIRED_SUBSYSTEMS = \ - LIBTALLOC EXT_LIB_GNUTLS + LIBTALLOC EXT_LIB_GNUTLS LIBSAMBA-CONFIG # # End SUBSYSTEM LIBTLS ################################################ -- cgit From 69b51f702af1ded825d5c17bdb97014cac12e752 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 24 Apr 2006 15:47:59 +0000 Subject: r15207: Introduce PRIVATE_DEPENDENCIES and PUBLIC_DEPENDENCIES as replacement for REQUIRED_SUBSYSTEMS. (This used to be commit adc8a019b6da256f104abed1b82bfde6998a2ac9) --- source4/lib/tls/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/tls/config.mk') diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk index 810dc17d2d..e68636e700 100644 --- a/source4/lib/tls/config.mk +++ b/source4/lib/tls/config.mk @@ -4,7 +4,7 @@ OBJ_FILES = \ tls.o \ tlscert.o -REQUIRED_SUBSYSTEMS = \ +PUBLIC_DEPENDENCIES = \ LIBTALLOC EXT_LIB_GNUTLS LIBSAMBA-CONFIG # # End SUBSYSTEM LIBTLS -- cgit From 0d5587b5d128d9dd502a3b78c02fb986b33d92c4 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 26 Apr 2006 12:22:54 +0000 Subject: r15274: Drop default EXT_LIB_ prefix for external libraries. Fixes issues with local (empty) libpopt.a overriding global one (This used to be commit 2f06305e53478e5030c24550954f221a9a97c83f) --- source4/lib/tls/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/tls/config.mk') diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk index e68636e700..2ab296049b 100644 --- a/source4/lib/tls/config.mk +++ b/source4/lib/tls/config.mk @@ -5,7 +5,7 @@ OBJ_FILES = \ tls.o \ tlscert.o PUBLIC_DEPENDENCIES = \ - LIBTALLOC EXT_LIB_GNUTLS LIBSAMBA-CONFIG + LIBTALLOC GNUTLS LIBSAMBA-CONFIG # # End SUBSYSTEM LIBTLS ################################################ -- cgit From a1a842eb44b5bbb59af445af7a2c4a00e8c0188a Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 21 Jul 2006 01:34:56 +0000 Subject: r17168: Now that TLS (and soon SASL) is below the socket layer, we need to make the testnonblock skip some things. The socket *under* the tls socket is still tested. Andrew Bartlett (This used to be commit 9c33c6a20a77e3f15eac3d62488117517afad940) --- source4/lib/tls/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/tls/config.mk') diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk index 2ab296049b..f75c613e73 100644 --- a/source4/lib/tls/config.mk +++ b/source4/lib/tls/config.mk @@ -5,7 +5,7 @@ OBJ_FILES = \ tls.o \ tlscert.o PUBLIC_DEPENDENCIES = \ - LIBTALLOC GNUTLS LIBSAMBA-CONFIG + LIBTALLOC GNUTLS LIBSAMBA-CONFIG samba-socket # # End SUBSYSTEM LIBTLS ################################################ -- cgit From b29d47edcf2767d7f9e9f63332079c6e8e89946c Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 3 Mar 2008 18:25:28 +0100 Subject: Move object file lists to the Makefile. (This used to be commit a7e6d2a1832db388fdafa1279f84c9a8bbfc87d6) --- source4/lib/tls/config.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'source4/lib/tls/config.mk') diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk index f75c613e73..a92321f59f 100644 --- a/source4/lib/tls/config.mk +++ b/source4/lib/tls/config.mk @@ -1,11 +1,7 @@ ################################################ # Start SUBSYSTEM LIBTLS [SUBSYSTEM::LIBTLS] -OBJ_FILES = \ - tls.o \ - tlscert.o PUBLIC_DEPENDENCIES = \ LIBTALLOC GNUTLS LIBSAMBA-CONFIG samba-socket -# -# End SUBSYSTEM LIBTLS -################################################ + +LIBTLS_OBJ_FILES = lib/tls/tls.o lib/tls/tlscert.o -- cgit From f41b9a9dde0dcad17e3a137537548f9bd9ab3901 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 1 Apr 2008 15:08:30 +0200 Subject: Rename libsamba-config to libsamba-hostconfig. (This used to be commit c46b7e90e347da76156ddcae4866adb88e9fec21) --- source4/lib/tls/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/tls/config.mk') diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk index f75c613e73..8e8330f709 100644 --- a/source4/lib/tls/config.mk +++ b/source4/lib/tls/config.mk @@ -5,7 +5,7 @@ OBJ_FILES = \ tls.o \ tlscert.o PUBLIC_DEPENDENCIES = \ - LIBTALLOC GNUTLS LIBSAMBA-CONFIG samba-socket + LIBTALLOC GNUTLS LIBSAMBA-HOSTCONFIG samba-socket # # End SUBSYSTEM LIBTLS ################################################ -- cgit From 333c169529a3f64a28fcaff1056069867fd56a90 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 18 May 2008 20:30:46 +0200 Subject: Use variables for source directory in remaining subsystems. (This used to be commit 6b6b2196a8a8d9e741f5c399185ded7a16938da0) --- source4/lib/tls/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/tls/config.mk') diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk index e2d7cd517a..e01f79ce10 100644 --- a/source4/lib/tls/config.mk +++ b/source4/lib/tls/config.mk @@ -2,4 +2,4 @@ PUBLIC_DEPENDENCIES = \ LIBTALLOC GNUTLS LIBSAMBA-HOSTCONFIG samba-socket -LIBTLS_OBJ_FILES = lib/tls/tls.o lib/tls/tlscert.o +LIBTLS_OBJ_FILES = $(addprefix $(libtlssrcdir)/, tls.o tlscert.o) -- cgit