Skip to content
Snippets Groups Projects

Master

Merged Anton Klarén requested to merge klaren/labcomm:master into master
+ 12
5
Compare changes
  • Side-by-side
  • Inline

Files

+ 4
5
@@ -17,15 +17,15 @@ all: labcomm.jar labcomm2014.jar labcomm2006.jar
@@ -17,15 +17,15 @@ all: labcomm.jar labcomm2014.jar labcomm2006.jar
labcomm.jar: gen/JAVAC
labcomm.jar: gen/JAVAC
echo $@
echo $@
cd gen ; jar cf ../$@ se/lth/control/labcomm/*.class se/lth/control/labcomm2006/*.class
cd gen ; jar cfm ../$@ ../osgi-manifest.txt se/lth/control/labcomm/*.class se/lth/control/labcomm2006/*.class
labcomm2014.jar: gen/JAVAC
labcomm2014.jar: gen/JAVAC
echo $@
echo $@
cd gen ; jar cf ../$@ se/lth/control/labcomm/*.class
cd gen ; jar cfm ../$@ ../osgi-manifest.txt se/lth/control/labcomm/*.class
labcomm2006.jar: gen/JAVAC
labcomm2006.jar: gen/JAVAC
echo $@
echo $@
cd gen ; jar cf ../$@ se/lth/control/labcomm2006/*.class
cd gen ; jar cfm ../$@ ../osgi-manifest.txt se/lth/control/labcomm2006/*.class
gen:
gen:
mkdir gen
mkdir gen
@@ -38,5 +38,4 @@ gen/JAVAC: $(MODULES:%=se/lth/control/labcomm/%.java) $(MODULES:%=se/lth/control
@@ -38,5 +38,4 @@ gen/JAVAC: $(MODULES:%=se/lth/control/labcomm/%.java) $(MODULES:%=se/lth/control
.PHONY: clean
.PHONY: clean
clean:
clean:
rm -rf labcomm.jar labcomm2006.jar labcomm2014.jar gen
rm -rf labcomm.jar labcomm2006.jar labcomm2014.jar gen
Loading