ifeq ($(enable_stow),yes)
stow_pkg_dir := $(prefix)/pkgs
- INSTALLDIR ?= $(DESTDIR)/$(stow_pkg_dir)/$(project_name)-$(project_ver)
+ INSTALLDIR ?= $(DESTDIR)$(stow_pkg_dir)/$(project_name)-$(project_ver)
else
- INSTALLDIR ?= $(DESTDIR)/$(prefix)
+ INSTALLDIR ?= $(DESTDIR)$(prefix)
endif
install_hdrs_dir := $(INSTALLDIR)/include/$(project_name)
sprojs := @subprojects@
sprojs_enabled := @subprojects_enabled@
-sprojs_include := -I. $(addprefix -I$(src_dir)/, $(sprojs_enabled))
+sprojs_include := -I. -I$(src_dir) $(addprefix -I$(src_dir)/, $(sprojs_enabled))
VPATH := $(addprefix $(src_dir)/, $(sprojs_enabled))
#-------------------------------------------------------------------------
STOW := @stow@
# Tests
-bintests = tests/gdbserver.py \
- tests/ebreak.py
+bintests = $(src_dir)/tests/ebreak.py
#-------------------------------------------------------------------------
# Include subproject makefile fragments
$(2)_deps += $$(patsubst %.o, %.d, $$($(2)_c_objs))
$(2)_deps += $$(patsubst %.h, %.h.d, $$($(2)_precompiled_hdrs))
$$($(2)_pch) : %.h.gch : %.h
- $(COMPILE) $$< -o $$@
+ $(COMPILE) -x c++-header $$< -o $$@
# If using clang, don't depend (and thus don't build) precompiled headers
$$($(2)_objs) : %.o : %.cc $$($(2)_gen_hdrs) $(if $(filter-out clang,$(CC)),$$($(2)_pch))
$(COMPILE) -c $$<
./$* < /dev/null 2>&1 | tee $@
check-cpp : $(test_outs)
- echo; grep -h -e'Unit Tests' -e'FAILED' -e'Segmentation' $^ < /dev/null; echo
+ @echo
+ ! grep -h -e'Unit Tests' -e'FAILED' -e'Segmentation' $^ < /dev/null
+ @echo
check-bin : $(bintest_outs)
- tail -n 1 $^ < /dev/null
+ ! tail -n 1 $^ < /dev/null 2>&1 | grep FAILED
check : check-cpp check-bin