Attachment 825912 Details for Bug 1023108 – patch fixing the make warning for duplicate target "clean"

[patch] patch fixing the make warning for duplicate target "clean"

0001-1023108-core-test-shows-make-warning-for-target-clea.patch (text/plain), 3.56 KB, created by Dong Zhu on 2013-11-19 06:49:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dong Zhu

Created: 2013-11-19 06:49:18 UTC

Size: 3.56 KB

patch

obsolete

>From a058dd6336953b4d8def5734d0572e2fb9a0ad3a Mon Sep 17 00:00:00 2001
>From: Dong Zhu <dzhu@redhat.com>
>Date: Tue, 19 Nov 2013 14:40:48 +0800
>Subject: [PATCH] 1023108 - core test shows make warning for target "clean"
>
>Signed-off-by: Dong Zhu <dzhu@redhat.com>
>---
> test-env/lib/hwcert-make.include |  7 ++++++-
> tests/core/Makefile              | 11 -----------
> tests/cpuscaling/Makefile        |  3 ---
> tests/memory/Makefile            |  3 ---
> tests/network/Makefile           |  6 ++++++
> tests/realtime/Makefile          |  3 ---
> tests/usb/Makefile               |  6 ++++++
> tests/wlan/Makefile              |  6 ++++++
> 8 files changed, 24 insertions(+), 21 deletions(-)
> create mode 100644 tests/network/Makefile
> create mode 100644 tests/usb/Makefile
> create mode 100644 tests/wlan/Makefile
>
>diff --git a/test-env/lib/hwcert-make.include b/test-env/lib/hwcert-make.include
>index 400c99a..f7943ad 100644
>--- a/test-env/lib/hwcert-make.include
>+++ b/test-env/lib/hwcert-make.include
>@@ -24,4 +24,9 @@ install: $(FILES)
> 	mkdir -p $(DEST)
> 	cp -a $(FILES) Makefile $(DEST)
> 
>-clean: ;
>+clean:
>+ifneq ($(BUILT_FILES),)
>+	rm -rf $(BUILT_FILES)
>+else
>+	@:
>+endif
>diff --git a/tests/core/Makefile b/tests/core/Makefile
>index 736a0da..9343b1b 100644
>--- a/tests/core/Makefile
>+++ b/tests/core/Makefile
>@@ -23,10 +23,6 @@ run: $(FILES) build
> build: $(BUILT_FILES)
> 	chmod a+x ./CORE2 ./core.py
> 
>-clean:
>-	rm -f $(BUILT_FILES)
>-
>-
> CFLAGS+=-Wall
> CFLAGS+=-DCPU_ALLOC
> # sched_setaffinity has no size_t argument on older systems.
>@@ -39,10 +35,3 @@ clocktest: clocktest.c
> 
> # Include Common Makefile
> include $(DESTDIR)/usr/share/hwcert/lib/hwcert-make.include
>-
>-
>-
>-
>-
>-
>-
>diff --git a/tests/cpuscaling/Makefile b/tests/cpuscaling/Makefile
>index 5dda77f..25e0896 100644
>--- a/tests/cpuscaling/Makefile
>+++ b/tests/cpuscaling/Makefile
>@@ -24,9 +24,6 @@ run: $(FILES) build
> build: $(BUILT_FILES)
> 	chmod a+x ./cpuscaling.py
> 
>-clean:
>-	rm -f $(BUILT_FILES)
>-
> aperf: aperf.c
> 	gcc -o aperf aperf.c -lm
> 
>diff --git a/tests/memory/Makefile b/tests/memory/Makefile
>index 57aec10..960cd25 100644
>--- a/tests/memory/Makefile
>+++ b/tests/memory/Makefile
>@@ -10,9 +10,6 @@ run: $(FILES) build
> build: $(BUILT_FILES)
> 	chmod a+x ./memory.py
> 
>-clean:
>-	rm -f $(BUILT_FILES)
>-
> # test-specific rules:
> CFLAGS+=-Wall
> ARCH := $(shell uname -i)
>diff --git a/tests/network/Makefile b/tests/network/Makefile
>new file mode 100644
>index 0000000..f5ffd93
>--- /dev/null
>+++ b/tests/network/Makefile
>@@ -0,0 +1,6 @@
>+
>+# no build necessary
>+build: ;
>+
>+# Include Common Makefile
>+include $(DESTDIR)/usr/share/hwcert/lib/hwcert-make.include
>\ No newline at end of file
>diff --git a/tests/realtime/Makefile b/tests/realtime/Makefile
>index 840dfe9..103ee05 100644
>--- a/tests/realtime/Makefile
>+++ b/tests/realtime/Makefile
>@@ -22,8 +22,5 @@ run: $(FILES) build
> build: $(BUILT_FILES)
> 	chmod a+x ./realtime.py
> 
>-clean:
>-	rm -f *~ $(BUILT_FILES)
>-
> # Include Common Makefile
> include $(DESTDIR)/usr/share/hwcert/lib/hwcert-make.include
>diff --git a/tests/usb/Makefile b/tests/usb/Makefile
>new file mode 100644
>index 0000000..f5ffd93
>--- /dev/null
>+++ b/tests/usb/Makefile
>@@ -0,0 +1,6 @@
>+
>+# no build necessary
>+build: ;
>+
>+# Include Common Makefile
>+include $(DESTDIR)/usr/share/hwcert/lib/hwcert-make.include
>\ No newline at end of file
>diff --git a/tests/wlan/Makefile b/tests/wlan/Makefile
>new file mode 100644
>index 0000000..f5ffd93
>--- /dev/null
>+++ b/tests/wlan/Makefile
>@@ -0,0 +1,6 @@
>+
>+# no build necessary
>+build: ;
>+
>+# Include Common Makefile
>+include $(DESTDIR)/usr/share/hwcert/lib/hwcert-make.include
>\ No newline at end of file
>-- 
>1.8.3.1
>

Flags:

gnichols: review+

Actions: View | Diff

Attachments on bug 1023108: 825912