arm_benchmarks: Modify the makefiles

* add check to verify the target filesystem exists. If it does not exist warn the builder to run the setup.sh script and exit * additionally move the install logic to the lowest level Makefile Signed-off-by: Jeff Lance <j-lance1@ti.com>
author: Jeff Lance 2014-02-05 10:35:32 -0600
committer: Jeff Lance 2014-02-05 10:37:27 -0600
commit: b1dfe3ea9c230a0b4988bff7dcd92381974a755a (patch)
tree: fd5cd7ed0b1586ae734c45adaa9a4c1f44712351
parent: 459c3f90ac5cf0fb98fa701cf3c9b99bebeac4f2 (diff)
download: arm_benchmarks-b1dfe3ea9c230a0b4988bff7dcd92381974a755a.tar.gz
arm_benchmarks-b1dfe3ea9c230a0b4988bff7dcd92381974a755a.tar.xz
arm_benchmarks-b1dfe3ea9c230a0b4988bff7dcd92381974a755a.zip
4 files changed, 102 insertions, 43 deletions
diff --git a/Makefile b/Makefile
index 54cbe3c..b1fd7a6 100644
--- a/Makefile
+++ b/Makefile
@@ -19,48 +19,11 @@ clean:
        done
 install:
-        @install -d $(DESTDIR)/usr/bin
+        for dir in $(DIRS); do \
-        @if [ -e dhrystone/Release/dhrystone ] ; then \
+                make -C $$dir install; \
-                install dhrystone/Release/dhrystone $(DESTDIR)/usr/bin/ ; \
+        done
-                echo "dhrystone release version installed."; \
-        else \
-                echo "dhrystone release version not built - nothing to install!"; \
-        fi
-        @if [ -e whetstone/Release/whetstone ] ; then \
-                install whetstone/Release/whetstone $(DESTDIR)/usr/bin/ ; \
-                echo "whetstone release version installed."; \
-        else \
-                echo "whetstone release version not built - nothing to install!" ; \
-        fi
-        @if [ -e linpack/Release/linpack ] ; then \
-                install linpack/Release/linpack $(DESTDIR)/usr/bin/ ; \
-                echo "linpack release version installed."; \
-        else \
-                echo "linpack release version not built - nothing to install!" ; \
-        fi
-        @install scripts/* $(DESTDIR)/usr/bin
 install_debug:
-        @install -d $(DESTDIR)/usr/bin
+        for dir in $(DIRS); do \
-        @if [ -e dhrystone/Debug/dhrystone ] ; then \
+                make -C $$dir install_debug; \
-                install dhrystone/Debug/dhrystone $(DESTDIR)/usr/bin/ ; \
+        done
-                echo "dhrystone debug version installed."; \
-                echo "NOTE: DEBUG VERSION WILL NOT YIELD MEANINGFUL BENCHMARK RESULTS."; \
-        else \
-                echo "drhystone debug version not built - nothing to install!"; \
-        fi
-        @if [ -e whetstone/Debug/whetstone ] ; then \
-                install whetstone/Debug/whetstone $(DESTDIR)/usr/bin/ ; \
-                echo "whetstone debug version installed."; \
-                echo "NOTE: DEBUG VERSION WILL NOT YIELD MEANINGFUL BENCHMARK RESULTS."; \
-        else \
-                echo "whetstone debug version not built - nothing to install!" ; \
-        fi
-        @if [ -e linpack/Debug/linpack ] ; then \
-                install linpack/Debug/linpack $(DESTDIR)/usr/bin/ ; \
-                echo "linpack debug version installed."; \
-                echo "NOTE: DEBUG VERSION WILL NOT YIELD MEANINGFUL BENCHMARK RESULTS."; \
-        else \
-                echo "linpack debug version not built - nothing to install!" ; \
-        fi
-        @install scripts/* $(DESTDIR)/usr/bin
diff --git a/dhrystone/Makefile b/dhrystone/Makefile
index 303be0a..76a2ffd 100644
--- a/dhrystone/Makefile
+++ b/dhrystone/Makefile
@@ -118,3 +118,35 @@ clean:
        @rm -rf $(OBJDIR_D)
        @rm -rf $(OBJDIR_R)
+.PHONY: install
+install:
+        @if [ ! -d $(DESTDIR) ] ; then \
+                echo "The extracted target filesystem directory doesn't exist."; \
+                echo "Please run setup.sh"; \
+                exit 1; \
+        fi
+        @install -d $(DESTDIR)/usr/bin
+        @if [ -e Release/dhrystone ] ; then \
+                install Release/dhrystone $(DESTDIR)/usr/bin/ ; \
+                echo "dhrystone release version installed."; \
+        else \
+                echo "dhrystone release version not built - nothing to install!"; \
+        fi
+        @install ../scripts/runDhrystone $(DESTDIR)/usr/bin
+.PHONY: install_debug
+install_debug:
+        @if [ ! -d $(DESTDIR) ] ; then \
+                echo "The extracted target filesystem directory doesn't exist."; \
+                echo "Please run setup.sh"; \
+                exit 1; \
+        fi
+        @install -d $(DESTDIR)/usr/bin
+        @if [ -e Debug/dhrystone ] ; then \
+                install Debug/dhrystone $(DESTDIR)/usr/bin/ ; \
+                echo "dhrystone debug version installed."; \
+                echo "NOTE: DEBUG VERSION WILL NOT YIELD MEANINGFUL BENCHMARK RESULTS."; \
+        else \
+                echo "dhrystone debug version not built - nothing to install!"; \
+        fi
+        @install ../scripts/runDhrystone $(DESTDIR)/usr/bin
diff --git a/linpack/Makefile b/linpack/Makefile
index 6a9e4b6..20dc4e2 100644
--- a/linpack/Makefile
+++ b/linpack/Makefile
@@ -121,3 +121,35 @@ clean:
        @rm -rf $(OBJDIR_D)
        @rm -rf $(OBJDIR_R)
+.PHONY: install
+install:
+        @if [ ! -d $(DESTDIR) ] ; then \
+                echo "The extracted target filesystem directory doesn't exist."; \
+                echo "Please run setup.sh"; \
+                exit 1; \
+        fi
+        @install -d $(DESTDIR)/usr/bin
+        @if [ -e Release/linpack ] ; then \
+                install Release/linpack $(DESTDIR)/usr/bin/ ; \
+                echo "linpack release version installed."; \
+        else \
+                echo "linpack release version not built - nothing to install!"; \
+        fi
+        @install ../scripts/runLinpack $(DESTDIR)/usr/bin
+.PHONY: install_debug
+install_debug:
+        @if [ ! -d $(DESTDIR) ] ; then \
+                echo "The extracted target filesystem directory doesn't exist."; \
+                echo "Please run setup.sh"; \
+                exit 1; \
+        fi
+        @install -d $(DESTDIR)/usr/bin
+        @if [ -e Debug/linpack ] ; then \
+                install Debug/linpack $(DESTDIR)/usr/bin/ ; \
+                echo "linpack debug version installed."; \
+                echo "NOTE: DEBUG VERSION WILL NOT YIELD MEANINGFUL BENCHMARK RESULTS."; \
+        else \
+                echo "linpack debug version not built - nothing to install!"; \
+        fi
+        @install ../scripts/runLinpack $(DESTDIR)/usr/bin
diff --git a/whetstone/Makefile b/whetstone/Makefile
index 90b6ced..d0ee0dd 100644
--- a/whetstone/Makefile
+++ b/whetstone/Makefile
@@ -121,3 +121,35 @@ clean:
        @rm -rf $(OBJDIR_D)
        @rm -rf $(OBJDIR_R)
+.PHONY: install
+install:
+        @if [ ! -d $(DESTDIR) ] ; then \
+                echo "The extracted target filesystem directory doesn't exist."; \
+                echo "Please run setup.sh"; \
+                exit 1; \
+        fi
+        @install -d $(DESTDIR)/usr/bin
+        @if [ -e Release/whetstone ] ; then \
+                install Release/whetstone $(DESTDIR)/usr/bin/ ; \
+                echo "whetstone release version installed."; \
+        else \
+                echo "whetstone release version not built - nothing to install!"; \
+        fi
+        @install ../scripts/runWhetstone $(DESTDIR)/usr/bin
+.PHONY: install_debug
+install_debug:
+        @if [ ! -d $(DESTDIR) ] ; then \
+                echo "The extracted target filesystem directory doesn't exist."; \
+                echo "Please run setup.sh"; \
+                exit 1; \
+        fi
+        @install -d $(DESTDIR)/usr/bin
+        @if [ -e Debug/whetstone ] ; then \
+                install Debug/whetstone $(DESTDIR)/usr/bin/ ; \
+                echo "whetstone debug version installed."; \
+                echo "NOTE: DEBUG VERSION WILL NOT YIELD MEANINGFUL BENCHMARK RESULTS."; \
+        else \
+                echo "whetstone debug version not built - nothing to install!"; \
+        fi
+        @install ../scripts/runWhetstone $(DESTDIR)/usr/bin
author	Jeff Lance	2014-02-05 10:35:32 -0600
committer	Jeff Lance	2014-02-05 10:37:27 -0600
commit	b1dfe3ea9c230a0b4988bff7dcd92381974a755a (patch)
tree	fd5cd7ed0b1586ae734c45adaa9a4c1f44712351
parent	459c3f90ac5cf0fb98fa701cf3c9b99bebeac4f2 (diff)
download	arm_benchmarks-b1dfe3ea9c230a0b4988bff7dcd92381974a755a.tar.gz arm_benchmarks-b1dfe3ea9c230a0b4988bff7dcd92381974a755a.tar.xz arm_benchmarks-b1dfe3ea9c230a0b4988bff7dcd92381974a755a.zip

diff --git a/Makefile b/Makefile index 54cbe3c..b1fd7a6 100644 --- a/Makefile +++ b/Makefile
@@ -19,48 +19,11 @@ clean:
19	done	19	done
20		20
21	install:	21	install:
22	@install -d $(DESTDIR)/usr/bin	22	for dir in $(DIRS); do \
23	@if [ -e dhrystone/Release/dhrystone ] ; then \	23	make -C $$dir install; \
24	install dhrystone/Release/dhrystone $(DESTDIR)/usr/bin/ ; \	24	done
25	echo "dhrystone release version installed."; \
26	else \
27	echo "dhrystone release version not built - nothing to install!"; \
28	fi
29	@if [ -e whetstone/Release/whetstone ] ; then \
30	install whetstone/Release/whetstone $(DESTDIR)/usr/bin/ ; \
31	echo "whetstone release version installed."; \
32	else \
33	echo "whetstone release version not built - nothing to install!" ; \
34	fi
35	@if [ -e linpack/Release/linpack ] ; then \
36	install linpack/Release/linpack $(DESTDIR)/usr/bin/ ; \
37	echo "linpack release version installed."; \
38	else \
39	echo "linpack release version not built - nothing to install!" ; \
40	fi
41	@install scripts/* $(DESTDIR)/usr/bin
42		25
43	install_debug:	26	install_debug:
44	@install -d $(DESTDIR)/usr/bin	27	for dir in $(DIRS); do \
45	@if [ -e dhrystone/Debug/dhrystone ] ; then \	28	make -C $$dir install_debug; \
46	install dhrystone/Debug/dhrystone $(DESTDIR)/usr/bin/ ; \	29	done
47	echo "dhrystone debug version installed."; \
48	echo "NOTE: DEBUG VERSION WILL NOT YIELD MEANINGFUL BENCHMARK RESULTS."; \
49	else \
50	echo "drhystone debug version not built - nothing to install!"; \
51	fi
52	@if [ -e whetstone/Debug/whetstone ] ; then \
53	install whetstone/Debug/whetstone $(DESTDIR)/usr/bin/ ; \
54	echo "whetstone debug version installed."; \
55	echo "NOTE: DEBUG VERSION WILL NOT YIELD MEANINGFUL BENCHMARK RESULTS."; \
56	else \
57	echo "whetstone debug version not built - nothing to install!" ; \
58	fi
59	@if [ -e linpack/Debug/linpack ] ; then \
60	install linpack/Debug/linpack $(DESTDIR)/usr/bin/ ; \
61	echo "linpack debug version installed."; \
62	echo "NOTE: DEBUG VERSION WILL NOT YIELD MEANINGFUL BENCHMARK RESULTS."; \
63	else \
64	echo "linpack debug version not built - nothing to install!" ; \
65	fi
66	@install scripts/* $(DESTDIR)/usr/bin


diff --git a/dhrystone/Makefile b/dhrystone/Makefile index 303be0a..76a2ffd 100644 --- a/dhrystone/Makefile +++ b/dhrystone/Makefile
@@ -118,3 +118,35 @@ clean:
118	@rm -rf $(OBJDIR_D)	118	@rm -rf $(OBJDIR_D)
119	@rm -rf $(OBJDIR_R)	119	@rm -rf $(OBJDIR_R)
120		120
		121	.PHONY: install
		122	install:
		123	@if [ ! -d $(DESTDIR) ] ; then \
		124	echo "The extracted target filesystem directory doesn't exist."; \
		125	echo "Please run setup.sh"; \
		126	exit 1; \
		127	fi
		128	@install -d $(DESTDIR)/usr/bin
		129	@if [ -e Release/dhrystone ] ; then \
		130	install Release/dhrystone $(DESTDIR)/usr/bin/ ; \
		131	echo "dhrystone release version installed."; \
		132	else \
		133	echo "dhrystone release version not built - nothing to install!"; \
		134	fi
		135	@install ../scripts/runDhrystone $(DESTDIR)/usr/bin
		136
		137	.PHONY: install_debug
		138	install_debug:
		139	@if [ ! -d $(DESTDIR) ] ; then \
		140	echo "The extracted target filesystem directory doesn't exist."; \
		141	echo "Please run setup.sh"; \
		142	exit 1; \
		143	fi
		144	@install -d $(DESTDIR)/usr/bin
		145	@if [ -e Debug/dhrystone ] ; then \
		146	install Debug/dhrystone $(DESTDIR)/usr/bin/ ; \
		147	echo "dhrystone debug version installed."; \
		148	echo "NOTE: DEBUG VERSION WILL NOT YIELD MEANINGFUL BENCHMARK RESULTS."; \
		149	else \
		150	echo "dhrystone debug version not built - nothing to install!"; \
		151	fi
		152	@install ../scripts/runDhrystone $(DESTDIR)/usr/bin


diff --git a/linpack/Makefile b/linpack/Makefile index 6a9e4b6..20dc4e2 100644 --- a/linpack/Makefile +++ b/linpack/Makefile
@@ -121,3 +121,35 @@ clean:
121	@rm -rf $(OBJDIR_D)	121	@rm -rf $(OBJDIR_D)
122	@rm -rf $(OBJDIR_R)	122	@rm -rf $(OBJDIR_R)
123		123
		124	.PHONY: install
		125	install:
		126	@if [ ! -d $(DESTDIR) ] ; then \
		127	echo "The extracted target filesystem directory doesn't exist."; \
		128	echo "Please run setup.sh"; \
		129	exit 1; \
		130	fi
		131	@install -d $(DESTDIR)/usr/bin
		132	@if [ -e Release/linpack ] ; then \
		133	install Release/linpack $(DESTDIR)/usr/bin/ ; \
		134	echo "linpack release version installed."; \
		135	else \
		136	echo "linpack release version not built - nothing to install!"; \
		137	fi
		138	@install ../scripts/runLinpack $(DESTDIR)/usr/bin
		139
		140	.PHONY: install_debug
		141	install_debug:
		142	@if [ ! -d $(DESTDIR) ] ; then \
		143	echo "The extracted target filesystem directory doesn't exist."; \
		144	echo "Please run setup.sh"; \
		145	exit 1; \
		146	fi
		147	@install -d $(DESTDIR)/usr/bin
		148	@if [ -e Debug/linpack ] ; then \
		149	install Debug/linpack $(DESTDIR)/usr/bin/ ; \
		150	echo "linpack debug version installed."; \
		151	echo "NOTE: DEBUG VERSION WILL NOT YIELD MEANINGFUL BENCHMARK RESULTS."; \
		152	else \
		153	echo "linpack debug version not built - nothing to install!"; \
		154	fi
		155	@install ../scripts/runLinpack $(DESTDIR)/usr/bin


diff --git a/whetstone/Makefile b/whetstone/Makefile index 90b6ced..d0ee0dd 100644 --- a/whetstone/Makefile +++ b/whetstone/Makefile
@@ -121,3 +121,35 @@ clean:
121	@rm -rf $(OBJDIR_D)	121	@rm -rf $(OBJDIR_D)
122	@rm -rf $(OBJDIR_R)	122	@rm -rf $(OBJDIR_R)
123		123
		124	.PHONY: install
		125	install:
		126	@if [ ! -d $(DESTDIR) ] ; then \
		127	echo "The extracted target filesystem directory doesn't exist."; \
		128	echo "Please run setup.sh"; \
		129	exit 1; \
		130	fi
		131	@install -d $(DESTDIR)/usr/bin
		132	@if [ -e Release/whetstone ] ; then \
		133	install Release/whetstone $(DESTDIR)/usr/bin/ ; \
		134	echo "whetstone release version installed."; \
		135	else \
		136	echo "whetstone release version not built - nothing to install!"; \
		137	fi
		138	@install ../scripts/runWhetstone $(DESTDIR)/usr/bin
		139
		140	.PHONY: install_debug
		141	install_debug:
		142	@if [ ! -d $(DESTDIR) ] ; then \
		143	echo "The extracted target filesystem directory doesn't exist."; \
		144	echo "Please run setup.sh"; \
		145	exit 1; \
		146	fi
		147	@install -d $(DESTDIR)/usr/bin
		148	@if [ -e Debug/whetstone ] ; then \
		149	install Debug/whetstone $(DESTDIR)/usr/bin/ ; \
		150	echo "whetstone debug version installed."; \
		151	echo "NOTE: DEBUG VERSION WILL NOT YIELD MEANINGFUL BENCHMARK RESULTS."; \
		152	else \
		153	echo "whetstone debug version not built - nothing to install!"; \
		154	fi
		155	@install ../scripts/runWhetstone $(DESTDIR)/usr/bin