From 7ad62c5ee6d0a93c8e6327e5683057b4dffe961e Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Sun, 20 Feb 2022 08:51:18 -0800 Subject: [PATCH] makefile: simplify the selection of simulators that can use network components --- makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/makefile b/makefile index e5c4baf6..fda3c6f1 100644 --- a/makefile +++ b/makefile @@ -126,16 +126,12 @@ ifneq (3,${SIM_MAJOR}) VIDEO_USEFUL = true endif endif -# building the KA10, KI10, KL10 or KS10 networking can be used. -ifneq (,$(or $(findstring pdp10-ka,${MAKECMDGOALS}),$(findstring pdp10-ki,${MAKECMDGOALS},$(findstring pdp10-kl,${MAKECMDGOALS})))) - NETWORK_USEFUL = true -endif # building the PDP-7 needs video support ifneq (,$(findstring pdp7,${MAKECMDGOALS})) VIDEO_USEFUL = true endif -# building the pdp11, pdp10, or any vax simulator could use networking support -ifneq (,$(or $(findstring pdp11,${MAKECMDGOALS}),$(findstring pdp10,${MAKECMDGOALS}),$(findstring vax,${MAKECMDGOALS}),$(findstring infoserver,${MAKECMDGOALS}),$(findstring 3b2,${MAKECMDGOALS})$(findstring all,${MAKECMDGOALS}))) +# building the pdp11, any pdp10, any 3b2, or any vax simulator could use networking support +ifneq (,$(findstring pdp11,${MAKECMDGOALS})$(findstring pdp10,${MAKECMDGOALS})$(findstring vax,${MAKECMDGOALS})$(findstring infoserver,${MAKECMDGOALS})$(findstring 3b2,${MAKECMDGOALS})$(findstring all,${MAKECMDGOALS})) NETWORK_USEFUL = true ifneq (,$(findstring all,${MAKECMDGOALS})) BUILD_MULTIPLE = s