|
@@ -58,19 +58,19 @@ endif
|
|
|
# as proper OTP applications when using -include_lib. This is a temporary
|
|
|
# fix, a proper fix would be to compile apps/* in the right order.
|
|
|
ifndef IS_APP
|
|
|
- $(verbose) for dep in $(ALL_APPS_DIRS) ; do \
|
|
|
- mkdir -p $$dep/ebin || exit $$?; \
|
|
|
+ $(verbose) set -e; for dep in $(ALL_APPS_DIRS) ; do \
|
|
|
+ mkdir -p $$dep/ebin; \
|
|
|
done
|
|
|
endif
|
|
|
# at the toplevel: if LOCAL_DEPS is defined with at least one local app, only
|
|
|
# compile that list of apps. otherwise, compile everything.
|
|
|
# within an app: compile all LOCAL_DEPS that are (uncompiled) local apps
|
|
|
- $(verbose) for dep in $(if $(LOCAL_DEPS_DIRS)$(IS_APP),$(LOCAL_DEPS_DIRS),$(ALL_APPS_DIRS)) ; do \
|
|
|
+ $(verbose) set -e; for dep in $(if $(LOCAL_DEPS_DIRS)$(IS_APP),$(LOCAL_DEPS_DIRS),$(ALL_APPS_DIRS)) ; do \
|
|
|
if grep -qs ^$$dep$$ $(ERLANG_MK_TMP)/apps.log; then \
|
|
|
:; \
|
|
|
else \
|
|
|
echo $$dep >> $(ERLANG_MK_TMP)/apps.log; \
|
|
|
- $(MAKE) -C $$dep IS_APP=1 || exit $$?; \
|
|
|
+ $(MAKE) -C $$dep IS_APP=1; \
|
|
|
fi \
|
|
|
done
|
|
|
|
|
@@ -84,15 +84,15 @@ deps::
|
|
|
else
|
|
|
deps:: $(ALL_DEPS_DIRS) apps clean-tmp-deps.log
|
|
|
$(verbose) mkdir -p $(ERLANG_MK_TMP)
|
|
|
- $(verbose) for dep in $(ALL_DEPS_DIRS) ; do \
|
|
|
+ $(verbose) set -e; for dep in $(ALL_DEPS_DIRS) ; do \
|
|
|
if grep -qs ^$$dep$$ $(ERLANG_MK_TMP)/deps.log; then \
|
|
|
:; \
|
|
|
else \
|
|
|
echo $$dep >> $(ERLANG_MK_TMP)/deps.log; \
|
|
|
if [ -f $$dep/GNUmakefile ] || [ -f $$dep/makefile ] || [ -f $$dep/Makefile ]; then \
|
|
|
- $(MAKE) -C $$dep IS_DEP=1 || exit $$?; \
|
|
|
+ $(MAKE) -C $$dep IS_DEP=1; \
|
|
|
else \
|
|
|
- echo "Error: No Makefile to build dependency $$dep."; \
|
|
|
+ echo "Error: No Makefile to build dependency $$dep." >&2; \
|
|
|
exit 2; \
|
|
|
fi \
|
|
|
fi \
|
|
@@ -525,7 +525,7 @@ $(DEPS_DIR)/$(call dep_name,$1):
|
|
|
$(eval DEP_NAME := $(call dep_name,$1))
|
|
|
$(eval DEP_STR := $(if $(filter-out $1,$(DEP_NAME)),$1,"$1 ($(DEP_NAME))"))
|
|
|
$(verbose) if test -d $(APPS_DIR)/$(DEP_NAME); then \
|
|
|
- echo "Error: Dependency" $(DEP_STR) "conflicts with application found in $(APPS_DIR)/$(DEP_NAME)."; \
|
|
|
+ echo "Error: Dependency" $(DEP_STR) "conflicts with application found in $(APPS_DIR)/$(DEP_NAME)." >&2; \
|
|
|
exit 17; \
|
|
|
fi
|
|
|
$(verbose) mkdir -p $(DEPS_DIR)
|
|
@@ -567,15 +567,15 @@ ifndef IS_APP
|
|
|
clean:: clean-apps
|
|
|
|
|
|
clean-apps:
|
|
|
- $(verbose) for dep in $(ALL_APPS_DIRS) ; do \
|
|
|
- $(MAKE) -C $$dep clean IS_APP=1 || exit $$?; \
|
|
|
+ $(verbose) set -e; for dep in $(ALL_APPS_DIRS) ; do \
|
|
|
+ $(MAKE) -C $$dep clean IS_APP=1; \
|
|
|
done
|
|
|
|
|
|
distclean:: distclean-apps
|
|
|
|
|
|
distclean-apps:
|
|
|
- $(verbose) for dep in $(ALL_APPS_DIRS) ; do \
|
|
|
- $(MAKE) -C $$dep distclean IS_APP=1 || exit $$?; \
|
|
|
+ $(verbose) set -e; for dep in $(ALL_APPS_DIRS) ; do \
|
|
|
+ $(MAKE) -C $$dep distclean IS_APP=1; \
|
|
|
done
|
|
|
endif
|
|
|
|