From a1bf4d956244aca087c5d321ebc4beeb7f8ade85 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Tue, 16 Jul 2024 10:41:20 +0000
Subject: [PATCH] make: Remove variables referencing other janware-projects

jw-build is meant as a generic set of tools for building other projects, so
references to projects being built by jw-build introduce a circular dependency.
Remove those references from defs.mk and rules.mk.

Variables removed by this commit:

	BTOOLS_DIR
	FEEDFSD_DIR
	FEEDFS_DIR
	FEEDFS_GUI_DIR
	FEEDFS_OBJECTS_DIR
	FEEDFS_UTILS_DIR
	FEEDFS_WT_DIR
	JUX_SHARED_DIR
	SITE_DIR
	VALDI_DIR
	XCHANGE_DIR

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/defs-dev.mk  | 12 ------------
 make/defs-dist.mk | 12 ------------
 make/defs.mk      | 14 --------------
 make/rules.mk     | 19 -------------------
 4 files changed, 57 deletions(-)

diff --git a/make/defs-dev.mk b/make/defs-dev.mk
index acfb297a..e42a25ba 100644
--- a/make/defs-dev.mk
+++ b/make/defs-dev.mk
@@ -258,18 +258,6 @@ PKG_CONFIGDIRMODE           ?= $(CFGDIRMODE)
 # for using the dbmalloc lib, before you will need to do:
 # cd $(JWBDIR)/contrib/dbmalloc; tar -xzf dbmalloc-ver.sion.tar.gz
 
-#USE_BTOOLS                 ?= true
-#USE_DSPFS                  ?= true
-
-#USE_ENGINE_BENNO           ?= true
-#USE_ENGINE_JAN             ?= true
-
-#USE_JACK                   ?= true
-#USE_JACKDUMMY              ?= true
-#USE_JACKJART               ?= true
-#USE_JACKRTAI               ?= true
-#USE_JACK                   ?= true
-
 #USE_DBMALLOC               ?= true
 #USE_DMALLOC                ?= true
 #USE_EFENCE                 ?= true
diff --git a/make/defs-dist.mk b/make/defs-dist.mk
index ea2e1a1d..30ecc7b8 100644
--- a/make/defs-dist.mk
+++ b/make/defs-dist.mk
@@ -258,18 +258,6 @@ PKG_CONFIGDIRMODE           ?= $(CFGDIRMODE)
 # for using the dbmalloc lib, before you will need to do:
 # cd $(JWBDIR)/contrib/dbmalloc; tar -xzf dbmalloc-ver.sion.tar.gz
 
-#USE_BTOOLS                 ?= true
-#USE_DSPFS                  ?= true
-
-#USE_ENGINE_BENNO           ?= true
-#USE_ENGINE_JAN             ?= true
-
-#USE_JACK                   ?= true
-#USE_JACKDUMMY              ?= true
-#USE_JACKJART               ?= true
-#USE_JACKRTAI               ?= true
-#USE_JACK                   ?= true
-
 #USE_DBMALLOC               ?= true
 #USE_DMALLOC                ?= true
 #USE_EFENCE                 ?= true
diff --git a/make/defs.mk b/make/defs.mk
index a27c6771..1fa07a0a 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -506,20 +506,6 @@ $(eval $(call try_include,$(JWBDIR)/make/local.mk))
 $(eval $(call try_include,$(TOPDIR)/make/local.mk))
 $(eval $(call try_include,local.mk))
 
-BTOOLS_DIR                  ?= $(call proj_dir, dspider-btools)
-#DSPCD_DIR                  ?= $(call proj_dir, dspcd)
-#DSPCD_EC_DIR               ?= $(call proj_dir, dspcd-ec)
-FEEDFSD_DIR                 ?= $(call proj_dir, feedfsd)
-FEEDFS_DIR                  := $(call proj_dir, feedfs)
-FEEDFS_GUI_DIR              ?= $(call proj_dir, feedfs-gui)
-FEEDFS_OBJECTS_DIR          ?= $(call proj_dir, feedfs-objects)
-FEEDFS_UTILS_DIR            ?= $(call proj_dir, feedfs-utils)
-FEEDFS_WT_DIR               ?= $(call proj_dir, feedfs-wt)
-JUX_SHARED_DIR              ?= $(call proj_dir, jux-shared)
-SITE_DIR                    ?= $(call proj_dir, site)
-VALDI_DIR                   ?= $(call proj_dir, valdi)
-XCHANGE_DIR                 ?= $(call proj_dir, xchange)
-
 all:
 
 nothing:
diff --git a/make/rules.mk b/make/rules.mk
index 3783c6eb..6aee74ef 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -197,25 +197,6 @@ echo-lddtree:
 echo-path:
 	@echo PATH = :$(PATH) | $(beautify_lib_path)
 
-echo-modules:
-	@echo "USERVER             = $(USERVER_DIR)"
-	@echo "XCHANGE             = $(XCHANGE_DIR)"
-	@echo "FEEDFS              = $(FEEDFS_DIR)"
-	@echo "FEEDFS_UTILS        = $(FEEDFS_UTILS_DIR)"
-	@echo "FEEDFS_NET          = $(FEEDFS_NET_DIR)"
-	@echo "DSPCD               = $(DSPCD_DIR)"
-	@echo "DSPROUT             = $(DSPROUT_DIR)"
-	@echo "DSPIDER_SHARED      = $(DSPIDER_SHARED_DIR)"
-	@echo "BTOOLS              = $(BTOOLS_DIR)"
-	@echo "CCONSOLE            = $(CCONSOLE_DIR)"
-	@echo "JACKJART            = $(JACKJART_DIR)"
-	@echo "JACKRTAI            = $(JACKRTAI_DIR)"
-	@echo "JACKDUMMY           = $(JACKDUMMY_DIR)"
-	@echo "ALSART              = $(ALSART_DIR)"
-	@echo "DSPFS               = $(DSPFS_DIR)"
-	@echo "JW_BUILD            = $(JW_BUILD_DIR)"
-	@echo "SCOPE_CASMIX        = $(SCOPE_CASMIX_DIR)"
-
 echo-include:
 	@echo "INCLUDE          : $(FINAL_INCLUDE)"