From aeddbd055f792bc4bd6fd4ab5b9544a2391758f5 Mon Sep 17 00:00:00 2001
From: Stephen Heumann <heumann1@illinois.edu>
Date: Sun, 31 May 2015 23:44:46 -0500
Subject: [PATCH] Divide telnet sources into two segments.

At this point, telnet will build and run, although it doesn't work properly.
---
 Makefile.common | 6 ++++--
 Makefile.mk     | 7 ++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index d7822e2..090da01 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -2,17 +2,19 @@ LIBTELNET_SRCS = \
   libtelnet/getaddrinfo.c \
   libtelnet/strlcpy.c
 
-TELNET_SRCS = \
+TELNET_SRCS_A = \
   libtelnet/genget.c \
   libtelnet/inet_ntop.c \
   telnet/commands.c \
   telnet/main.c \
   telnet/network.c \
   telnet/ring.c \
-  telnet/sys_bsd.c \
+  telnet/sys_bsd.c
+TELNET_SRCS_B = \
   telnet/telnet.c \
   telnet/terminal.c \
   telnet/utilities.c
+TELNET_SRCS = $(TELNET_SRCS_A) $(TELNET_SRCS_B)
 
 TELNETD_SRCS = \
   libtelnet/getent.c \
diff --git a/Makefile.mk b/Makefile.mk
index 9d3129c..3da4bcf 100644
--- a/Makefile.mk
+++ b/Makefile.mk
@@ -8,9 +8,14 @@ LIBS = -l/usr/lib/libtermcap.204 -l/usr/lib/libnetdb
 
 CFLAGS = -i -w
 
+TELNET_A_SPECIFIC = $(TELNET_SPECIFIC) -STELNET_A__
+TELNET_B_SPECIFIC = $(TELNET_SPECIFIC) -STELNET_B__
+TELNETD_SPECIFIC += -STELNETD___
+
 $(OBJS): $(HEADERS)
 %.o: %.c
 	$(CC) $(INCLUDES) \
-		$(!eq,$(TELNET_SRCS:s/$<//),$(TELNET_SRCS) $(TELNET_SPECIFIC)) \
+		$(!eq,$(TELNET_SRCS_A:s/$<//),$(TELNET_SRCS_A) $(TELNET_A_SPECIFIC)) \
+		$(!eq,$(TELNET_SRCS_B:s/$<//),$(TELNET_SRCS_B) $(TELNET_B_SPECIFIC)) \
 		$(!eq,$(TELNETD_SRCS:s/$<//),$(TELNETD_SRCS) $(TELNETD_SPECIFIC)) \
 		$(CFLAGS) -c $< -o $@