From a39191ba80ab56ba0218bc4e476c06724f944040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net>
Date: Tue, 26 Dec 2023 11:56:50 -0500
Subject: [PATCH] Tie sftp lib to the rest of the build

---
 src/build/Common.gmake | 6 ++++++
 src/sftp/Common.make   | 5 +++++
 2 files changed, 11 insertions(+)
 create mode 100644 src/sftp/Common.make

diff --git a/src/build/Common.gmake b/src/build/Common.gmake
index e375a7b092..475fdec384 100644
--- a/src/build/Common.gmake
+++ b/src/build/Common.gmake
@@ -89,6 +89,7 @@
 #  SMBLIB_SRC		- Path to smblib source									#
 #  ENCODE_SRC	    - Path to encode lib source								#
 #  HASH_SRC			- Path to hash lib source								#
+#  SFTP_SRC			- Path to sftp lib source								#
 #  MT_CFLAGS		- CFLAGS for building MT objects						#
 #  MT_LDFLAGS		- LDFLAGS for linking MT targets						#
 #  UL_PRE			- Use Library prefix (*nix is -l)						#
@@ -426,6 +427,7 @@ ENCODE_SRC	:=	$(SRC_ROOT)$(DIRSEP)encode
 HASH_SRC 	:=	$(SRC_ROOT)$(DIRSEP)hash
 3RDP_ROOT	?=	$(SRC_ROOT)$(DIRSEP)..$(DIRSEP)3rdp
 3RDP_BUILD	:=	$(3RDP_ROOT)$(DIRSEP)build
+SFTP_SRC	:=	$(SRC_ROOT)$(DIRSEP)sftp
 
 # SDL ciolib enabled by default for the moment.
 ifndef WITHOUT_SDL
@@ -447,6 +449,7 @@ endif
 -include		$(HASH_SRC)$(DIRSEP)Common.gmake
 -include		$(3RDP_BUILD)$(DIRSEP)Common.make
 -include		$(3RDP_BUILD)$(DIRSEP)Common.gmake
+-include		$(SFTP_SRC)$(DIRSEP)Common.make
 
 ifdef DEBUG
  CFLAGS	+=	-ggdb
@@ -556,3 +559,6 @@ $(CRYPT_LIB):  $(CRYPT_DEPS)
 cl:
 	$(MAKE) -C $(3RDPBUILDDIR) cryptlib
 
+$(SFTPLIB-MT): sftp-mt
+sftp-mt:
+	$(MAKE) -C $(SFTP_SRC) mtlib
diff --git a/src/sftp/Common.make b/src/sftp/Common.make
new file mode 100644
index 0000000000..0ad1467212
--- /dev/null
+++ b/src/sftp/Common.make
@@ -0,0 +1,5 @@
+SFTPLIB-MT  =       $(SFTP_SRC)$(DIRSEP)$(LIBODIR)$(DIRSEP)$(LIBPREFIX)uifc_mt$(LIBFILE)
+
+SFTP-MT_CFLAGS   =       -I$(SFTP_SRC)
+SFTP-MT_LDFLAGS  =       -L$(SFTP_SRC)$(DIRSEP)$(LIBODIR)
+SFTP-MT_LIBS	=	$(UL_PRE)sftp_mt$(UL_SUF)
-- 
GitLab