From 5faa54c70750d0c73f386a7f9b595337f635a26b Mon Sep 17 00:00:00 2001 From: Terraneo Federico <fede.tft@miosix.org> Date: Tue, 8 Dec 2015 15:34:31 +0100 Subject: [PATCH] Reordered new stuff in Makefiles --- Makefile | 16 ++++++++-------- miosix/Makefile | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 0b0bd7b5..89b7b3bd 100644 --- a/Makefile +++ b/Makefile @@ -8,14 +8,6 @@ KPATH := miosix CONFPATH := $(KPATH) include $(CONFPATH)/config/Makefile.inc -ifeq ("$(VERBOSE)","1") -Q := -ECHO := @true -else -Q := @ -ECHO := @echo -endif - ## ## List here subdirectories which contains makefiles ## @@ -41,6 +33,14 @@ INCLUDE_DIRS := ## You should not need to modify anything below ## ############################################################################## +ifeq ("$(VERBOSE)","1") +Q := +ECHO := @true +else +Q := @ +ECHO := @echo +endif + ## Replaces both "foo.cpp"-->"foo.o" and "foo.c"-->"foo.o" OBJ := $(addsuffix .o, $(basename $(SRC))) diff --git a/miosix/Makefile b/miosix/Makefile index d5b65fac..f259ebfc 100644 --- a/miosix/Makefile +++ b/miosix/Makefile @@ -6,14 +6,6 @@ MAKEFILE_VERSION := 1.07 ## KPATH and CONFPATH are forwarded by the parent Makefile include $(CONFPATH)/config/Makefile.inc -ifeq ("$(VERBOSE)","1") -Q := -ECHO := @true -else -Q := @ -ECHO := @echo -endif - ## List of all Miosix OS source files that have no special requirements ## and that must be built for each architecture (both .c and .cpp) ## These files will end up in libmiosix.a @@ -56,6 +48,14 @@ util/lcd44780.cpp ## architecture/board is selected in config/Makefile.inc SRC += $(ARCH_SRC) +ifeq ("$(VERBOSE)","1") +Q := +ECHO := @true +else +Q := @ +ECHO := @echo +endif + ## Replaces both "foo.cpp"-->"foo.o" and "foo.c"-->"foo.o" OBJ := $(addsuffix .o, $(basename $(SRC))) -- GitLab