changeset 71:2d7064ff0003

* Makefile: Generalize SCRIPTNAME.
author Mark Wielaard <mark@klomp.org>
date Fri, 09 Dec 2011 01:33:34 +0100
parents d07084d19e7c
children 45ac459f8752
files ChangeLog Makefile
diffstat 2 files changed, 13 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Nov 10 19:58:52 2011 +0100
+++ b/ChangeLog	Fri Dec 09 01:33:34 2011 +0100
@@ -1,3 +1,7 @@
+2011-12-09  Mark Wielaard  <mark@klomp.org>
+
+	* Makefile: Generalize SCRIPTNAME.
+
 2011-11-10  Mark Wielaard  <mark@klomp.org>
 
 	* Mandelbrot.java: Turn into a true oneliner.
--- a/Makefile	Thu Nov 10 19:58:52 2011 +0100
+++ b/Makefile	Fri Dec 09 01:33:34 2011 +0100
@@ -1,18 +1,19 @@
 JAVASOURCES = Hello.java World.java Mandelbrot.java
 MAINCLASS = Hello
+SCRIPTNAME = helloworld
 
-helloworld: ${JAVASOURCES}
+${SCRIPTNAME}: ${JAVASOURCES}
 	javac ${JAVASOURCES}
-	echo "java ${MAINCLASS} \$$1" > helloworld
-	chmod 755 helloworld
+	echo "java ${MAINCLASS} \$$1" > ${SCRIPTNAME}
+	chmod 755 ${SCRIPTNAME}
 
 clean:
 	rm -f *.class
-	rm -f helloworld
+	rm -f ${SCRIPTNAME}
 
-check: helloworld
-	echo "Testing helloworld runs and exits with no error"
+check: ${SCRIPTNAME}
+	echo "Testing ${SCRIPTNAME} runs and exits with no error"
 	echo "HINT: Must at least produce Hello World"
-	./helloworld | grep "Hello World"
+	./${SCRIPTNAME} | grep "Hello World"
 
-all: helloworld
+all: ${SCRIPTNAME}