diff --git a/src/JavaGUI2/log4j-1.2.8.jar b/src/JavaGUI2/log4j-1.2.8.jar deleted file mode 100644 index 493a3ccc1..000000000 Binary files a/src/JavaGUI2/log4j-1.2.8.jar and /dev/null differ diff --git a/src/Makefile b/src/Makefile index 1c774c9c8..efc8befca 100644 --- a/src/Makefile +++ b/src/Makefile @@ -119,7 +119,7 @@ javac: jar: javac cd JavaGUI; $(JAR) -cmf manifest.txt gf-java.jar *.class ; cd .. - cd $(GFEDITOR) ; rm -rf jarcontents ; mkdir jarcontents ; cp -r de/ ManifestMain.txt jarcontents ; cat jargs-1.0.jar | (cd jarcontents; jar -x jargs) ; cat log4j-1.2.8.jar | (cd jarcontents; jar -x org) ; cd jarcontents ; $(JAR) -cmf ManifestMain.txt ../gfeditor.jar de/uka/ilkd/key/ocl/gf/*.class org jargs ; cd .. ; rm -rf jarcontents ; cd .. + cd $(GFEDITOR) ; rm -rf jarcontents ; mkdir jarcontents ; cp -r de/ ManifestMain.txt jarcontents ; cat jargs-1.0.jar | (cd jarcontents; jar -x jargs) ; cd jarcontents ; $(JAR) -cmf ManifestMain.txt ../gfeditor.jar de/uka/ilkd/key/ocl/gf/*.class jargs ; cd .. ; rm -rf jarcontents ; cd .. showflags: @echo $(GHCFLAGS)