From eee385dade7576cc04079bc02657268a44f0aa58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sven=20Gesteg=C3=A5rd=20Robertz?= <sven@drrobertz.cs.lth.se>
Date: Mon, 2 Dec 2013 09:33:29 +0100
Subject: [PATCH] added rules for making compiler and lib
---
examples/tcp/Makefile | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/examples/tcp/Makefile b/examples/tcp/Makefile
index e982202..f5004cc 100644
--- a/examples/tcp/Makefile
+++ b/examples/tcp/Makefile
@@ -1,6 +1,6 @@
LCDIR=../..
-LCC=java -jar ${LCDIR}/compiler/labComm.jar
-CLASSPATH=.:${LCDIR}/lib/java/labcomm.jar
+LCCJAR=${LCDIR}/compiler/labComm.jar
+LCLJAR=${LCDIR}/lib/java/labcomm.jar
JAVA_PKG=labcommTCPtest
.PHONY : clean run runserver runOSserver runclient
@@ -14,25 +14,33 @@ run : ${JAVA_PKG}/Example.class ${JAVA_PKG}/server/TestServer.class ${JAVA_PKG}/
### dependencies and parts ####################
###############################################
-${JAVA_PKG}/gen/FooSample.java: test.lc
+LCC=java -jar ${LCCJAR}
+CLASSPATH=.:${LCLJAR}
+
+${LCCJAR} :
+ cd ${LCDIR} && make make-compiler
+
+${LCLJAR} :
+ cd ${LCDIR}/lib/java && make labcomm.jar
+
+${JAVA_PKG}/gen/FooSample.java: test.lc ${LCCJAR}
${LCC} --javapackage=${JAVA_PKG}.gen --java=${JAVA_PKG}/gen $<
-${JAVA_PKG}/gen/FooSample.class: ${JAVA_PKG}/gen/FooSample.java
+${JAVA_PKG}/gen/FooSample.class: ${JAVA_PKG}/gen/FooSample.java ${LCLJAR}
javac -cp ${CLASSPATH} $<
-${JAVA_PKG}/Example.class: ${JAVA_PKG}/Example.java ${JAVA_PKG}/gen/FooSample.class
+${JAVA_PKG}/Example.class: ${JAVA_PKG}/Example.java ${JAVA_PKG}/gen/FooSample.class ${LCLJAR}
javac -cp ${CLASSPATH} $<
-${JAVA_PKG}/server/TestServer.class: ${JAVA_PKG}/server/TestServer.java ${JAVA_PKG}/gen/FooSample.class
+${JAVA_PKG}/server/TestServer.class: ${JAVA_PKG}/server/TestServer.java ${JAVA_PKG}/gen/FooSample.class ${LCLJAR}
javac -cp ${CLASSPATH} $<
-${JAVA_PKG}/server/OneShotServer.class: ${JAVA_PKG}/server/OneShotServer.java ${JAVA_PKG}/gen/FooSample.class
+${JAVA_PKG}/server/OneShotServer.class: ${JAVA_PKG}/server/OneShotServer.java ${JAVA_PKG}/gen/FooSample.class ${LCLJAR}
javac -cp ${CLASSPATH} $<
-${JAVA_PKG}/client/TestClient.class: ${JAVA_PKG}/client/TestClient.java ${JAVA_PKG}/gen//FooSample.class
+${JAVA_PKG}/client/TestClient.class: ${JAVA_PKG}/client/TestClient.java ${JAVA_PKG}/gen//FooSample.class ${LCLJAR}
javac -cp ${CLASSPATH} $<
-
runserver : ${JAVA_PKG}/server/TestServer.class
java -cp ${CLASSPATH} $(<:.class=)
--
GitLab