From a8bf726a17ef826cc35e180605dfee3921146007 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Tue, 23 Feb 2016 21:33:10 +0000
Subject: [PATCH] projs-dir.mk: Make targets "all" and "install" work

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/make.mk         |  2 +-
 make/projects-dir.mk | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/make/make.mk b/make/make.mk
index f6f1d31b..f494a4c8 100644
--- a/make/make.mk
+++ b/make/make.mk
@@ -59,7 +59,7 @@ $(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_D
 		-V $(shell echo $(PROJECT) | tr a-z- A-Z_)_DIR=$(PROJECT_DIRPATH) \
 		-r "$(RPM_REQUIRES_RUN)" \
 		-R "$(RPM_REQUIRES_DEVEL)" \
-		-l "-L$(PROJECT_DIRPATH)/lib -l$(LIBNAME)"
+		-l "-L$(PROJECT_DIRPATH)/lib -l$(LIBNAME)" \
 		$(CREATE_PKG_CONFIG_OPTS) \
 		> $@.tmp
 	mv $@.tmp $@
diff --git a/make/projects-dir.mk b/make/projects-dir.mk
index 1245b229..d6071f3d 100644
--- a/make/projects-dir.mk
+++ b/make/projects-dir.mk
@@ -11,17 +11,26 @@ PROJECTS = $(shell cat projects.txt | sed '/^ *\#/ d')
 # TODO: this could be nicer
 CVS_PROJECTS = $(PROJECTS)
 else
-PROJECTS ?= $(dir $(wildcard */CVS */.git))
+PROJECTS ?= $(patsubst %/,%,$(dir $(wildcard */CVS */.git)))
 CVS_PROJECTS = $(filter $(dir $(wildcard */CVS)),$(PROJECTS))
 endif
 
 WHOAMI = $(shell id -un)
 PGIT   = CLONE_PROJECTS="$(PROJECTS)" CLONE_FROM_USER="$(shell whoami)" /bin/bash $(firstword $(wildcard ./ytools/devutil/scripts/pgit.sh /opt/ytools/bin/pgit.sh))
 
+EXCLUDE_FROM_BUILD = \
+	dspider-btools \
+	dspider-shared \
+	feedfs-dspcd \
+	casview \
+	dspfs \
+	feedfs-qt \
+	jux3
+
 all:
-	for p in $(PROJECTS); do make -C $$p || break; done
-clean:
-	for p in $(PROJECTS); do make -C $$p clean || break; done
+
+all clean:
+	python ./ytools/devutil/scripts/build.py -b $(shell pwd) $@ $(filter-out $(EXCLUDE_FROM_BUILD),$(PROJECTS))
 
 clean-dirs:
 	ls */dirs-all.done 2>/dev/null | sed 's%/.*%%' | xargs -r build.py -b $(shell pwd) clean