From 09314f765a1b4620a45497308ac74d8421b9b21a Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Thu, 28 Jan 2016 12:38:32 +0000
Subject: [PATCH] defs.mk: Add convenience XXX_DIR variables

- 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>
---
 make/defs.mk | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/make/defs.mk b/make/defs.mk
index b697588f..6a3a7d5e 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -710,13 +710,8 @@ define install_links
 		done;
 endef
 
-define proj_query
-	$(shell python $(MOD_SCRIPT_DIR)/projects.py -p $(CVS_PROJ_DIR) $(1))
-endef
-
-define proj_dir
-	$(call proj_query, proj-dir $(1))
-endef
+proj_query  = $(shell python $(MOD_SCRIPT_DIR)/projects.py -p $(CVS_PROJ_DIR) $(1))
+proj_dir    = $(call proj_query,proj-dir $(1))
 
 # ----- local.mk
 
@@ -921,11 +916,30 @@ INCLUDE               += $(PROJECT_INCLUDE) -I$(TOPDIR)/include
 LIBFLAGS              += -L$(BUILD_LIBDIR)
 endif
 
-INCLUDE                   += $(call proj_query, cflags  $(PROJECT))
-LIBFLAGS                  += $(call proj_query, ldflags $(PROJECT))
+INCLUDE                   += $(call proj_query, cflags  $(PREREQ_BUILD) $(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
 
+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_RUN                ?= $(PREREQ_INSTALL)