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

projs-dir.mk: Make targets "all" and "install" work

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-02-23 21:33:10 +00:00
commit a8bf726a17
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/make.mk
View file

@ -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) \ -V $(shell echo $(PROJECT) | tr a-z- A-Z_)_DIR=$(PROJECT_DIRPATH) \
-r "$(RPM_REQUIRES_RUN)" \ -r "$(RPM_REQUIRES_RUN)" \
-R "$(RPM_REQUIRES_DEVEL)" \ -R "$(RPM_REQUIRES_DEVEL)" \
-l "-L$(PROJECT_DIRPATH)/lib -l$(LIBNAME)" -l "-L$(PROJECT_DIRPATH)/lib -l$(LIBNAME)" \
$(CREATE_PKG_CONFIG_OPTS) \ $(CREATE_PKG_CONFIG_OPTS) \
> $@.tmp > $@.tmp
mv $@.tmp $@ mv $@.tmp $@

17
make/projects-dir.mk
View file

@ -11,17 +11,26 @@ PROJECTS = $(shell cat projects.txt | sed '/^ *\#/ d')
# TODO: this could be nicer # TODO: this could be nicer
CVS_PROJECTS = $(PROJECTS) CVS_PROJECTS = $(PROJECTS)
else else
PROJECTS ?= $(dir $(wildcard */CVS */.git)) PROJECTS ?= $(patsubst %/,%,$(dir $(wildcard */CVS */.git)))
CVS_PROJECTS = $(filter $(dir $(wildcard */CVS)),$(PROJECTS)) CVS_PROJECTS = $(filter $(dir $(wildcard */CVS)),$(PROJECTS))
endif endif
WHOAMI = $(shell id -un) 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)) 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: all:
for p in $(PROJECTS); do make -C $$p || break; done
clean: all clean:
for p in $(PROJECTS); do make -C $$p clean || break; done python ./ytools/devutil/scripts/build.py -b $(shell pwd) $@ $(filter-out $(EXCLUDE_FROM_BUILD),$(PROJECTS))
clean-dirs: clean-dirs:
ls */dirs-all.done 2>/dev/null | sed 's%/.*%%' | xargs -r build.py -b $(shell pwd) clean ls */dirs-all.done 2>/dev/null | sed 's%/.*%%' | xargs -r build.py -b $(shell pwd) clean