[ntpsec commit] Simplify SNTP build.

Amar Takhar amar at ntpsec.org
Tue Sep 29 17:50:19 UTC 2015


Module:    ntpsec
Branch:    master
Commit:    6ae19a103e672fe23c073d88774641ec7b7ef3b5
Changeset: http://git.ntpsec.org/ntpsec/commit/?id=6ae19a103e672fe23c073d88774641ec7b7ef3b5

Author:    Amar Takhar <verm at darkbeer.org>
Date:      Tue Sep 29 13:37:07 2015 -0400

Simplify SNTP build.

---

 sntp/wscript | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/sntp/wscript b/sntp/wscript
index 59a28fc..1b734c0 100644
--- a/sntp/wscript
+++ b/sntp/wscript
@@ -9,42 +9,24 @@ def build(ctx):
 	srcnode = ctx.srcnode.abspath()
 	bldnode = ctx.bldnode.abspath()
 
-	libsntp_source = [
+	sntp_source = [
 		"crypto.c",
 		"kod_management.c",
 		"log.c",
 		"main.c",
 		"networking.c",
+		"sntp.c",
 		"utilities.c"
 	]
 
 	ctx(
-		target		= "sntp_obj", # XXX: to avoid target clash lookup how to fix this.
-		features	= "c bld_include src_include libisc_include",
-		source		= libsntp_source,
-		# defines		= ["HAVE_CONFIG_H=1"],
-		includes	= [
-						"%s/sntp/" % bldnode
-					] + ctx.env.PLATFORM_INCLUDES,
-	)
-
-
-	ctx(
-		target		= "sntp_lib", # XXX: to avoid target clash lookup how to fix this.
-		features	= "c cstlib",
-		use			= "sntp_obj"
-	)
-
-
-	sntp_source = [
-		"sntp.c"
-	]
-
-	ctx(
 		target		= "sntp",
 		features	= "c cprogram bld_include src_include libisc_include ntp_version",
 		use			= "ntp isc opts M PTHREAD sntp_obj LIBEVENT LIBEVENT_CORE LIBEVENT_PTHREADS RT CRYPTO",
 		source		= sntp_source,
 		# defines		= ["HAVE_CONFIG_H=1"],
+		includes	= [
+						"%s/sntp/" % bldnode
+					] + ctx.env.PLATFORM_INCLUDES, # XXX: Hack needs to use libevent_inc or something else.
 		install_path= "${PREFIX}/sbin/",
 	)



More information about the vc mailing list