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

targets-tools.mk: Search for headers in build directory first

Browse source 
Use target all.link only aftr headers have been copied, to have build
directory searched for header files first.

Signed-off-by: Jan Lindemann <jan@jannet.de>
This commit is contained in:
Jan Lindemann 2013-05-30 12:50:40 +00:00 • committed by Jan Lindemann
commit 50d9375560
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
make/targets-tools.mk
View file

@ -3,29 +3,28 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
all: all.link
include $(MODDIR)/make/rules.mk include $(MODDIR)/make/rules.mk
ifneq ($(strip $(SRC_ALL_CPP)),) ifneq ($(strip $(SRC_ALL_CPP)),)
# mandatory targets # mandatory targets
all: all.link
install: $(ALL) install: $(ALL)
# convenience targets # convenience targets
link: all.link link: all.link
clean-link: clean.link clean-link: clean.link
all.link: $(PROJECT) all.link: $(HDRDIR_SCOPE_SUFFIX)
$(PROJECT): $(HDRDIR_SCOPE_SUFFIX):
ln -s . $@ ln -s . $@
ifeq ($(SCOPE_PREFIX),) ifeq ($(SCOPE_PREFIX),)
all.link: $(BUILD_HDRDIR)/$(PROJECT) all.link: $(BUILD_HDRDIR)/$(HDRDIR_SCOPE_SUFFIX)
$(BUILD_HDRDIR)/$(PROJECT): $(BUILD_HDRDIR)/$(HDRDIR_SCOPE_SUFFIX):
cd $(BUILD_HDRDIR) && ln -s . $(PROJECT) cd $(BUILD_HDRDIR_BASE) && ln -s . $(HDRDIR_SCOPE_SUFFIX)
endif endif
$(LIB_SO): $(OBJ) $(LIB_SO): $(OBJ)
@ -37,5 +36,5 @@ endif
clean: objclean textclean localclean profclean clean.link clean: objclean textclean localclean profclean clean.link
clean.link: clean.link:
if [ -L $(PROJECT) -a "`readlink $(PROJECT)`" = . ]; then rm $(PROJECT); fi if [ -L $(HDRDIR_SCOPE_SUFFIX) -a "`readlink $(HDRDIR_SCOPE_SUFFIX)`" = . ]; then rm $(HDRDIR_SCOPE_SUFFIX); fi