Skip to content
Snippets Groups Projects
Commit 1865bd6a authored by Tommy Olofsson's avatar Tommy Olofsson
Browse files

Fixed makefile.

parent 36a6853b
Branches master
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 4 additions and 5 deletions
lib/java/Makefile
+ 4
− 5
View file @ 1865bd6a
...@@ -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 cfm ../$@ osgi-manifest.txt 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 cfm ../$@ osgi-manifest.txt 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 cfm ../$@ osgi-manifest.txt se/lth/control/labcomm2006/*.class cd gen ; jar cfm ../$@ ../osgi-manifest.txt se/lth/control/labcomm2006/*.class
gen: gen:
mkdir gen mkdir gen
...@@ -39,4 +39,3 @@ gen/JAVAC: $(MODULES:%=se/lth/control/labcomm/%.java) $(MODULES:%=se/lth/control ...@@ -39,4 +39,3 @@ gen/JAVAC: $(MODULES:%=se/lth/control/labcomm/%.java) $(MODULES:%=se/lth/control
clean: clean:
rm -rf labcomm.jar labcomm2006.jar labcomm2014.jar gen rm -rf labcomm.jar labcomm2006.jar labcomm2014.jar gen
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment