janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-26 15:23:54 +01:00
Code Activity

defs.mk: Add convenience XXX_DIR variables

Browse source 
- Fix misplaced tabs in proj_dir and proj_query
- Honour USE_PROJECT_LIB in creation of ldflags
- Define some project variables used in projects all over the place

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-01-28 12:38:32 +00:00
commit 09314f765a
1 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

32
make/defs.mk
View file

@ -710,13 +710,8 @@ define install_links
done; done;
endef endef
define proj_query proj_query = $(shell python $(MOD_SCRIPT_DIR)/projects.py -p $(CVS_PROJ_DIR) $(1))
$(shell python $(MOD_SCRIPT_DIR)/projects.py -p $(CVS_PROJ_DIR) $(1)) proj_dir = $(call proj_query,proj-dir $(1))
endef
define proj_dir
$(call proj_query, proj-dir $(1))
endef
# ----- local.mk # ----- local.mk
@ -921,11 +916,30 @@ INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include
LIBFLAGS += -L$(BUILD_LIBDIR) LIBFLAGS += -L$(BUILD_LIBDIR)
endif endif
INCLUDE += $(call proj_query, cflags $(PROJECT)) INCLUDE += $(call proj_query, cflags $(PREREQ_BUILD) $(PROJECT))
LIBFLAGS += $(call proj_query, ldflags $(PROJECT))
ifneq ($(USE_PROJECT_LIB),false)
LIBFLAGS += $(call proj_query, ldflags $(PREREQ_BUILD) $(PROJECT))
else
LIBFLAGS += $(call proj_query, ldflags $(PREREQ_BUILD))
endif
#include $(MODDIR)/make/lib-deps.mk #include $(MODDIR)/make/lib-deps.mk
BTOOLS_DIR = $(call proj_dir, 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)
#PREREQ_INSTALL ?= $(PREREQ_BUILD) #PREREQ_INSTALL ?= $(PREREQ_BUILD)
#PREREQ_RUN ?= $(PREREQ_INSTALL) #PREREQ_RUN ?= $(PREREQ_INSTALL)