From 082f06f5261f283252d4f58f52f3fde9cb6db5e8 Mon Sep 17 00:00:00 2001 From: Vladimir Broz Date: Mon, 4 Mar 2013 19:58:19 +0100 Subject: [PATCH] patch provided by A. Pogrebennyk - no build errors when using CI system and not installing default config files --- apps/Makefile | 8 ++++---- apps/dsm/mods/Makefile | 2 +- apps/examples/Makefile | 2 +- apps/examples/tutorial/Makefile | 2 +- core/Makefile | 2 -- core/plug-in/Makefile.app_module | 4 ++-- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/apps/Makefile b/apps/Makefile index 394a78fd..6f91d016 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -58,16 +58,16 @@ clean: .PHONY: modules modules: - -@for r in $(app_modules) "" ; do \ - if [ -n "$$r" ]; then \ + @for r in $(app_modules) "" ; do \ + if [ -n "$$r" -a -f "$$r"/Makefile ]; then \ echo "" ; \ echo "" ; \ - COREPATH=../$(COREPATH) $(MAKE) -C $$r all; \ + COREPATH=../$(COREPATH) $(MAKE) -C $$r all || exit 1; \ fi ; \ done .PHONY: install -install: install-bin install-cfg +install: install-bin .PHONY: install-bin install-bin: diff --git a/apps/dsm/mods/Makefile b/apps/dsm/mods/Makefile index bf6de2a8..bb797a44 100644 --- a/apps/dsm/mods/Makefile +++ b/apps/dsm/mods/Makefile @@ -41,7 +41,7 @@ modules: done .PHONY: install -install: install-bin install-cfg +install: install-bin .PHONY: install-bin install-bin: diff --git a/apps/examples/Makefile b/apps/examples/Makefile index c0206a0f..6e32b9da 100644 --- a/apps/examples/Makefile +++ b/apps/examples/Makefile @@ -33,7 +33,7 @@ modules: done .PHONY: install -install: install-bin install-cfg +install: install-bin .PHONY: install-bin install-bin: diff --git a/apps/examples/tutorial/Makefile b/apps/examples/tutorial/Makefile index f451a1d0..80d8a1d9 100644 --- a/apps/examples/tutorial/Makefile +++ b/apps/examples/tutorial/Makefile @@ -33,7 +33,7 @@ modules: done .PHONY: install -install: install-bin install-cfg +install: install-bin .PHONY: install-bin install-bin: diff --git a/core/Makefile b/core/Makefile index 21bd7af1..5049fff8 100644 --- a/core/Makefile +++ b/core/Makefile @@ -70,8 +70,6 @@ $(NAME): $(NAME).o $(OBJS) ../Makefile.defs install: all mk-install-dirs \ install-audio \ - install-modules-cfg \ - install-cfg \ install-bin \ install-modules diff --git a/core/plug-in/Makefile.app_module b/core/plug-in/Makefile.app_module index ad8587d0..03c3ff9e 100644 --- a/core/plug-in/Makefile.app_module +++ b/core/plug-in/Makefile.app_module @@ -27,12 +27,12 @@ depends = $(srcs:.cpp=.d) .PHONY: all all: $(extra_target) - -@$(MAKE) deps && \ + @$(MAKE) deps && \ $(MAKE) $(lib_full_name) .PHONY: module_package module_package: $(extra_target) - -@$(MAKE) deps && \ + @$(MAKE) deps && \ $(MAKE) $(lib_name)