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

make/*.mk: More performance tweaks

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-02-28 16:12:58 +00:00
commit f40356cf59
5 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

19
make/defs-dirs.mk
View file

@ -8,22 +8,3 @@ SUBDIRS ?= $(ORDERED_SUBDIRS) $(filter-out $(ORDERED_SUBDIRS),$(F
#SUBDIRS ?= $(filter-out $(ORDERED_SUBDIRS),$(FIND_SUBDIRS))
#SUBDIRS ?= $(FIND_SUBDIRS)
ifneq ($(DONT_CHECK_PREREQ_DONE),true)
ifndef PREREQ
PREREQ := $(call proj_query,pkg-requires --no-version --no-subpackages --subsections=jw --delimiter=' ' build $(PROJECT))
endif
ifndef PREREQ_DIRS
PREREQ_DIRS := $(call proj_query,proj-dir $(PREREQ))
endif
PREREQ_DIRS_DONE := $(addsuffix /dirs-all.done,$(filter-out $(TOPDIR) /opt/%,$(PREREQ_DIRS)))
endif
ifneq ($(SUBDIRS_TO_ITERATE),)
ifeq ($(MAKECMDGOALS),)
SUBDIR_TARGETS = all
else
SUBDIR_TARGETS = $(filter $(ALLOWED_SUBDIR_TARGETS),$(MAKECMDGOALS))
endif
endif

2
make/defs.mk
View file

@ -582,7 +582,7 @@ 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_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)

2
make/make.mk
View file

@ -6,7 +6,7 @@
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/defs-dirs.mk
CACHED_FILES ?= $(VERSION_FILE)
CACHED_FILES ?= $(VERSION_FILE) $(wildcard $(TOPDIR)/make/project.conf)
CACHED_VARS ?= PROJECT PREREQ VERSION HEX_VERSION
include $(MODDIR)/make/cache.mk

2
make/subdirs.mk
View file

@ -1,3 +1,5 @@
include $(MODDIR)/make/defs-dirs.mk
all:
clean: clean.var
distclean: clean.var distclean.var

21
make/topdir.mk
View file

@ -34,6 +34,27 @@ REMOTE_GIT_DIR = /srv/git/$(JANWARE_USER)/$(REMOTE_GIT_FLAVOUR)/$(RPM_PROJECT)
REMOTE_GIT_URL = ssh://$(JANWARE_USER)@git.janware.com$(REMOTE_GIT_DIR)
include $(MODDIR)/make/dirs.mk
ifneq ($(DONT_CHECK_PREREQ_DONE),true)
ifndef PREREQ
PREREQ := $(call proj_query,pkg-requires --no-version --no-subpackages --subsections=jw --delimiter=' ' build $(PROJECT))
endif
ifndef PREREQ_DIRS
PREREQ_DIRS := $(call proj_query,proj-dir $(PREREQ))
endif
PREREQ_DIRS_DONE := $(addsuffix /dirs-all.done,$(filter-out $(TOPDIR) /opt/%,$(PREREQ_DIRS)))
endif
ifneq ($(SUBDIRS_TO_ITERATE),)
ifeq ($(MAKECMDGOALS),)
SUBDIR_TARGETS = all
else
SUBDIR_TARGETS = $(filter $(ALLOWED_SUBDIR_TARGETS),$(MAKECMDGOALS))
endif
endif
include $(MODDIR)/make/rpmdist.mk
include $(MODDIR)/make/rules.mk
include $(MODDIR)/make/doc-rules.mk