From 43ec94a665e13552402ff4f102e0f65f6792cf29 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 13 Apr 2014 16:24:28 -0600 Subject: More trailing whilespace removal --- apps/examples/nxflat/Makefile | 2 +- apps/examples/nxflat/tests/Makefile | 4 ++-- apps/examples/nxflat/tests/errno/Makefile | 2 +- apps/examples/nxflat/tests/hello++/Makefile | 2 +- apps/examples/nxflat/tests/hello++/hello++2.cpp | 2 +- apps/examples/nxflat/tests/hello/Makefile | 2 +- apps/examples/nxflat/tests/longjmp/Makefile | 2 +- apps/examples/nxflat/tests/longjmp/longjmp.c | 2 +- apps/examples/nxflat/tests/mutex/Makefile | 2 +- apps/examples/nxflat/tests/pthread/Makefile | 2 +- apps/examples/nxflat/tests/signal/Makefile | 2 +- apps/examples/nxflat/tests/struct/Makefile | 2 +- apps/examples/nxflat/tests/struct/struct_main.c | 2 +- apps/examples/nxflat/tests/task/Makefile | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) (limited to 'apps/examples/nxflat') diff --git a/apps/examples/nxflat/Makefile b/apps/examples/nxflat/Makefile index 94092bd39..a750c8e2c 100644 --- a/apps/examples/nxflat/Makefile +++ b/apps/examples/nxflat/Makefile @@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: headers clean depend distclean diff --git a/apps/examples/nxflat/tests/Makefile b/apps/examples/nxflat/tests/Makefile index 53e43288f..8a65d6494 100644 --- a/apps/examples/nxflat/tests/Makefile +++ b/apps/examples/nxflat/tests/Makefile @@ -57,7 +57,7 @@ $(foreach DIR, $(SUBDIRS), $(eval $(call DIR_template,$(DIR),build, all))) $(foreach DIR, $(SUBDIRS), $(eval $(call DIR_template,$(DIR),clean,clean))) $(foreach DIR, $(SUBDIRS), $(eval $(call DIR_template,$(DIR),install,install))) -# Build program(s) in each sud-directory +# Build program(s) in each sud-directory build: $(foreach DIR, $(SUBDIRS), $(DIR)_build) @@ -84,7 +84,7 @@ $(ROMFS_IMG): populate $(ROMFS_HDR) : $(ROMFS_IMG) @(cd $(TESTS_DIR); xxd -i romfs.img | sed -e "s/^unsigned/static const unsigned/g" >$@) -# Create the dirlist.h header file from the romfs directory +# Create the dirlist.h header file from the romfs directory $(ROMFS_DIRLIST) : populate @$(TESTS_DIR)/mkdirlist.sh $(ROMFS_DIR) >$@ diff --git a/apps/examples/nxflat/tests/errno/Makefile b/apps/examples/nxflat/tests/errno/Makefile index d8d75b227..d161a6496 100644 --- a/apps/examples/nxflat/tests/errno/Makefile +++ b/apps/examples/nxflat/tests/errno/Makefile @@ -69,7 +69,7 @@ $(BIN): $(BIN).r2 @echo "LD: $<" $(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call DELFILE, $(R2SRC)) $(call DELFILE, *.r1) diff --git a/apps/examples/nxflat/tests/hello++/Makefile b/apps/examples/nxflat/tests/hello++/Makefile index 739562905..fb8922a1b 100644 --- a/apps/examples/nxflat/tests/hello++/Makefile +++ b/apps/examples/nxflat/tests/hello++/Makefile @@ -162,7 +162,7 @@ $(BIN3): $(BIN3).r2 # @echo "LD: $<" # $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN1)) $(call DELFILE, $(BIN2)) $(call DELFILE, $(BIN3)) diff --git a/apps/examples/nxflat/tests/hello++/hello++2.cpp b/apps/examples/nxflat/tests/hello++/hello++2.cpp index 3a1798a70..1c5a11fc5 100644 --- a/apps/examples/nxflat/tests/hello++/hello++2.cpp +++ b/apps/examples/nxflat/tests/hello++/hello++2.cpp @@ -61,7 +61,7 @@ public: printf("CThingSayer::CThingSayer: I am!\n"); szWhatToSay = (const char*)NULL; } - + ~CThingSayer(void) { printf("CThingSayer::~CThingSayer: I cease to be\n"); diff --git a/apps/examples/nxflat/tests/hello/Makefile b/apps/examples/nxflat/tests/hello/Makefile index b4521a74e..2efa6dbca 100644 --- a/apps/examples/nxflat/tests/hello/Makefile +++ b/apps/examples/nxflat/tests/hello/Makefile @@ -69,7 +69,7 @@ $(BIN): $(BIN).r2 @echo "LD: $<" $(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call DELFILE, $(R2SRC)) $(call DELFILE, *.r1) diff --git a/apps/examples/nxflat/tests/longjmp/Makefile b/apps/examples/nxflat/tests/longjmp/Makefile index 76d49417c..dbfd5fc91 100644 --- a/apps/examples/nxflat/tests/longjmp/Makefile +++ b/apps/examples/nxflat/tests/longjmp/Makefile @@ -69,7 +69,7 @@ $(BIN): $(BIN).r2 @echo "LD: $<" $(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call DELFILE, $(R2SRC)) $(call DELFILE, *.r1) diff --git a/apps/examples/nxflat/tests/longjmp/longjmp.c b/apps/examples/nxflat/tests/longjmp/longjmp.c index f43096514..12f3d99df 100644 --- a/apps/examples/nxflat/tests/longjmp/longjmp.c +++ b/apps/examples/nxflat/tests/longjmp/longjmp.c @@ -77,7 +77,7 @@ static int leaf(int *some_arg) /* We should not get here */ - return -ERROR; + return -ERROR; } static int function(int some_arg) diff --git a/apps/examples/nxflat/tests/mutex/Makefile b/apps/examples/nxflat/tests/mutex/Makefile index d45c49ddd..526099819 100644 --- a/apps/examples/nxflat/tests/mutex/Makefile +++ b/apps/examples/nxflat/tests/mutex/Makefile @@ -69,7 +69,7 @@ $(BIN): $(BIN).r2 @echo "LD: $<" $(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call DELFILE, $(R2SRC)) $(call DELFILE, *.r1) diff --git a/apps/examples/nxflat/tests/pthread/Makefile b/apps/examples/nxflat/tests/pthread/Makefile index fffb13dfb..e16a8f623 100644 --- a/apps/examples/nxflat/tests/pthread/Makefile +++ b/apps/examples/nxflat/tests/pthread/Makefile @@ -70,7 +70,7 @@ $(BIN): $(BIN).r2 @echo "LD: $<" $(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call DELFILE, $(R2SRC)) $(call DELFILE, *.r1) diff --git a/apps/examples/nxflat/tests/signal/Makefile b/apps/examples/nxflat/tests/signal/Makefile index 372100030..43e4742b5 100644 --- a/apps/examples/nxflat/tests/signal/Makefile +++ b/apps/examples/nxflat/tests/signal/Makefile @@ -69,7 +69,7 @@ $(BIN): $(BIN).r2 @echo "LD: $<" $(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call DELFILE, $(R2SRC)) $(call DELFILE, *.r1) diff --git a/apps/examples/nxflat/tests/struct/Makefile b/apps/examples/nxflat/tests/struct/Makefile index ff15256af..bee07d1e5 100644 --- a/apps/examples/nxflat/tests/struct/Makefile +++ b/apps/examples/nxflat/tests/struct/Makefile @@ -71,7 +71,7 @@ $(BIN): $(BIN).r2 @echo "LD: $<" $(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call DELFILE, $(R2SRC)) $(call DELFILE, *.r1) diff --git a/apps/examples/nxflat/tests/struct/struct_main.c b/apps/examples/nxflat/tests/struct/struct_main.c index f454b8ae7..8646a0c49 100644 --- a/apps/examples/nxflat/tests/struct/struct_main.c +++ b/apps/examples/nxflat/tests/struct/struct_main.c @@ -46,7 +46,7 @@ * Public Data ****************************************************************************/ -const struct struct_dummy_s dummy_struct = +const struct struct_dummy_s dummy_struct = { DUMMY_SCALAR_VALUE3 }; diff --git a/apps/examples/nxflat/tests/task/Makefile b/apps/examples/nxflat/tests/task/Makefile index a528c60b7..afd4754b6 100644 --- a/apps/examples/nxflat/tests/task/Makefile +++ b/apps/examples/nxflat/tests/task/Makefile @@ -69,7 +69,7 @@ $(BIN): $(BIN).r2 @echo "LD: $<" $(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call DELFILE, $(R2SRC)) $(call DELFILE, *.r1) -- cgit v1.2.3