janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

make: Remove variables referencing other janware-projects

Browse source 
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>
This commit is contained in:
Jan Lindemann 2024-07-16 10:41:20 +00:00
commit a1bf4d9562
4 changed files with 0 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

12
make/defs-dev.mk
View file

@ -258,18 +258,6 @@ PKG_CONFIGDIRMODE ?= $(CFGDIRMODE)
# for using the dbmalloc lib, before you will need to do: # for using the dbmalloc lib, before you will need to do:
# cd $(JWBDIR)/contrib/dbmalloc; tar -xzf dbmalloc-ver.sion.tar.gz # 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_DBMALLOC ?= true
#USE_DMALLOC ?= true #USE_DMALLOC ?= true
#USE_EFENCE ?= true #USE_EFENCE ?= true

12
make/defs-dist.mk
View file

@ -258,18 +258,6 @@ PKG_CONFIGDIRMODE ?= $(CFGDIRMODE)
# for using the dbmalloc lib, before you will need to do: # for using the dbmalloc lib, before you will need to do:
# cd $(JWBDIR)/contrib/dbmalloc; tar -xzf dbmalloc-ver.sion.tar.gz # 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_DBMALLOC ?= true
#USE_DMALLOC ?= true #USE_DMALLOC ?= true
#USE_EFENCE ?= true #USE_EFENCE ?= true

14
make/defs.mk
View file

@ -506,20 +506,6 @@ $(eval $(call try_include,$(JWBDIR)/make/local.mk))
$(eval $(call try_include,$(TOPDIR)/make/local.mk)) $(eval $(call try_include,$(TOPDIR)/make/local.mk))
$(eval $(call try_include,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: all:
nothing: nothing:

19
make/rules.mk
View file

@ -197,25 +197,6 @@ echo-lddtree:
echo-path: echo-path:
@echo PATH = :$(PATH) | $(beautify_lib_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:
@echo "INCLUDE : $(FINAL_INCLUDE)" @echo "INCLUDE : $(FINAL_INCLUDE)"