From fd53709e9aaab7946a487e5859e2860e8938a7d5 Mon Sep 17 00:00:00 2001 From: gatecat Date: Mon, 3 Jan 2022 19:36:08 +0000 Subject: [PATCH] Remove unnecessary dependency on now-obsolete -ltermcap Signed-off-by: gatecat --- distrib/sources/api/tcl/Makefile | 2 +- distrib/sources/mbktools/Makefile | 4 ++-- distrib/sources/tas/etas/Makefile | 2 -- distrib/sources/tas/mcc/Makefile | 2 -- distrib/sources/tas/tas/Makefile | 4 ++-- distrib/sources/tas/xtas/Makefile | 2 +- distrib/sources/yagle/xyagle/Makefile | 4 ++-- 7 files changed, 8 insertions(+), 12 deletions(-) diff --git a/distrib/sources/api/tcl/Makefile b/distrib/sources/api/tcl/Makefile index 0aab997..140c000 100644 --- a/distrib/sources/api/tcl/Makefile +++ b/distrib/sources/api/tcl/Makefile @@ -106,7 +106,7 @@ LIB = -L$(TARGET_LIB) $(STATIC_LIB) \ $(VCD_L) \ $(RPC_L) -ledit -API_STATICLIB = -L$(TARGET_LIB) $(STATIC_LIB) $(WHOLE) $(LIB) $(TCL_L) $(APIALL_L) $(NOWHOLE) -ledit -ltermcap -lpthread -ldl -lm +API_STATICLIB = -L$(TARGET_LIB) $(STATIC_LIB) $(WHOLE) $(LIB) $(TCL_L) $(APIALL_L) $(NOWHOLE) -ledit -lpthread -ldl -lm WRAP = $(TARGET_BIN)/wrap -silent diff --git a/distrib/sources/mbktools/Makefile b/distrib/sources/mbktools/Makefile index 046ec67..a5ba0f0 100644 --- a/distrib/sources/mbktools/Makefile +++ b/distrib/sources/mbktools/Makefile @@ -87,11 +87,11 @@ all : $(TARGET_BIN)/router $(TARGET_BIN)/netutil headers : $(TARGET_BIN)/router : $(ROU_OBJ) - $(CPLUSPLUS) $(LOCAL_CFLAGS) $(ROU_OBJ) -o $(TARGET_BIN)/router $(FLEXOBJS) $(WHOLE) $(LOCAL_LIB) $(TCL_L) $(NOWHOLE) $(FLEXLIBS) -leditline -ltermcap -ldl + $(CPLUSPLUS) $(LOCAL_CFLAGS) $(ROU_OBJ) -o $(TARGET_BIN)/router $(FLEXOBJS) $(WHOLE) $(LOCAL_LIB) $(TCL_L) $(NOWHOLE) $(FLEXLIBS) -leditline -ldl $(STRIP) $(TARGET_BIN)/router $(TARGET_BIN)/netutil : $(NET_OBJ) - $(CPLUSPLUS) $(LOCAL_CFLAGS) $(NET_OBJ) -o $(TARGET_BIN)/netutil $(FLEXOBJS) $(WHOLE) $(LOCAL_LIB) $(TCL_L) $(NOWHOLE) $(FLEXLIBS) -leditline -ltermcap -ldl + $(CPLUSPLUS) $(LOCAL_CFLAGS) $(NET_OBJ) -o $(TARGET_BIN)/netutil $(FLEXOBJS) $(WHOLE) $(LOCAL_LIB) $(TCL_L) $(NOWHOLE) $(FLEXLIBS) -leditline -ldl $(STRIP) $(TARGET_BIN)/netutil .c.o : diff --git a/distrib/sources/tas/etas/Makefile b/distrib/sources/tas/etas/Makefile index 83487c7..7e09325 100644 --- a/distrib/sources/tas/etas/Makefile +++ b/distrib/sources/tas/etas/Makefile @@ -10,7 +10,6 @@ SHELL = /bin/sh ETAS_OBJ = etas.o READ_L = -leditline -TERM_L = -ltermcap LOCAL_INC = $(INCLUDE64BIT) \ -I$(TARGET_INCLUDE) \ @@ -82,7 +81,6 @@ LOCAL_LIB = $(FLEXOBJS) $(STATIC_LIB) \ $(MUT_L) \ $(READ_L) \ $(RPC_L) \ - $(TERM_L) \ -lm $(FLEXLIBS) -ldl $(TARGET_BIN)/etas : $(ETAS_OBJ) diff --git a/distrib/sources/tas/mcc/Makefile b/distrib/sources/tas/mcc/Makefile index 3260c20..80f72f3 100644 --- a/distrib/sources/tas/mcc/Makefile +++ b/distrib/sources/tas/mcc/Makefile @@ -22,7 +22,6 @@ MCC_MOD_BIN = parsetech MCC_HEADER = mcc_lib.h READ_L = -leditline -TERM_L = -ltermcap LOCAL_INC = $(INCLUDE64BIT) \ -I$(TARGET_INCLUDE) @@ -97,7 +96,6 @@ LOCAL_LIB = $(FLEXOBJS) $(STATIC_LIB) \ $(AVT_L) \ $(RPC_L) \ $(READ_L) \ - $(TERM_L) \ -lm $(FLEXLIBS) -ldl all : lib diff --git a/distrib/sources/tas/tas/Makefile b/distrib/sources/tas/tas/Makefile index 7f1b9d0..31b09c5 100644 --- a/distrib/sources/tas/tas/Makefile +++ b/distrib/sources/tas/tas/Makefile @@ -108,8 +108,8 @@ REGULAR_LIB = $(TAS_L) \ $(MUT_L) \ $(RPC_L) \ -LOCAL_LIB = $(FLEXOBJS) -L$(TARGET_LIB) $(WHOLE) $(REGULAR_LIB) -leditline -ltermcap -ldl -lm $(NOWHOLE) $(FLEXLIBS) -API_STATICLIB = $(FLEXOBJS) -L$(TARGET_LIB) $(STATIC_LIB) $(WHOLE) $(REGULAR_LIB) $(TCL_L) $(APIALL_L) $(NOWHOLE) -leditline -ltermcap -ldl -lm $(FLEXLIBS) +LOCAL_LIB = $(FLEXOBJS) -L$(TARGET_LIB) $(WHOLE) $(REGULAR_LIB) -leditline -ldl -lm $(NOWHOLE) $(FLEXLIBS) +API_STATICLIB = $(FLEXOBJS) -L$(TARGET_LIB) $(STATIC_LIB) $(WHOLE) $(REGULAR_LIB) $(TCL_L) $(APIALL_L) $(NOWHOLE) -leditline -ldl -lm $(FLEXLIBS) all : lib diff --git a/distrib/sources/tas/xtas/Makefile b/distrib/sources/tas/xtas/Makefile index c535c20..4b8cc1a 100644 --- a/distrib/sources/tas/xtas/Makefile +++ b/distrib/sources/tas/xtas/Makefile @@ -136,7 +136,7 @@ REGULAR_LIB = $(XYA_L) \ $(RPC_L) LOCAL_LIB = $(FLEXOBJS) $(STATIC_LIB) -L$(TARGET_LIB) $(WHOLE) $(REGULAR_LIB) $(NOWHOLE) $(TCL_L)\ - -L$(MOTIF_LIB) -lXm -L$(XPM_LIB) -lXpm -L$(X11_LIB) -ledit -ltermcap -lXt -lX11 -lpthread -ldl -lm $(FLEXLIBS) $(PSP_L) + -L$(MOTIF_LIB) -lXm -L$(XPM_LIB) -lXpm -L$(X11_LIB) -ledit -lXt -lX11 -lpthread -ldl -lm $(FLEXLIBS) $(PSP_L) API_LIB = $(WHOLE) $(APIALL_L) $(NOWHOLE) diff --git a/distrib/sources/yagle/xyagle/Makefile b/distrib/sources/yagle/xyagle/Makefile index d0d7e2d..6ba5b12 100644 --- a/distrib/sources/yagle/xyagle/Makefile +++ b/distrib/sources/yagle/xyagle/Makefile @@ -131,9 +131,9 @@ REGULAR_LIB = $(CGV_L) \ LOCAL_MBK_LIB = -L$(TARGET_LIB) $(WHOLE) $(REGULAR_LIB) $(NOWHOLE) -ldl $(PSP_L) API_STATICLIB = $(FLEXOBJS) $(STATIC_LIB) $(LOCAL_MOTIF_LIB) $(LOCAL_X11_LIB) $(LOCAL_XPM_LIB) \ - -L$(TARGET_LIB) $(WHOLE) $(APIALL_L) $(TCL_L) $(REGULAR_LIB) $(NOWHOLE) -leditline -ltermcap -ldl -lm $(FLEXLIBS) + -L$(TARGET_LIB) $(WHOLE) $(APIALL_L) $(TCL_L) $(REGULAR_LIB) $(NOWHOLE) -leditline -ldl -lm $(FLEXLIBS) -LOCAL_LIB = $(FLEXOBJS) $(STATIC_LIB) $(LOCAL_MOTIF_LIB) $(LOCAL_X11_LIB) $(LOCAL_XPM_LIB) $(LOCAL_MBK_LIB) $(TCL_L) -ledit -lpthread -ltermcap -lm $(FLEXLIBS) +LOCAL_LIB = $(FLEXOBJS) $(STATIC_LIB) $(LOCAL_MOTIF_LIB) $(LOCAL_X11_LIB) $(LOCAL_XPM_LIB) $(LOCAL_MBK_LIB) $(TCL_L) -ledit -lpthread -lm $(FLEXLIBS) # /*------------------------------------------------------------\ # | Local objects | -- 2.30.2