aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile13
-rw-r--r--java.mk7
2 files changed, 10 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 608a12f..a27f9ac 100644
--- a/Makefile
+++ b/Makefile
@@ -27,13 +27,12 @@ tests:
dist: class
(cd src && $(JAR) cvfm ../$(DIST) ../manifest fr/dgac/ivy/*.class fr/dgac/ivy/tools/*.class )
-#jar: class
- #ln -sf src/fr .
- #ln -sf bundle/${dist}gnu .
- #ln -sf bundle/${dist}org .
- #mkdir lib
- #$(JAR) cfm lib/ivy-java.jar manifest fr/dgac/ivy/*.class fr/dgac/ivy/tools/*.class src/Makefile src/*.java README COPYING.LIB Changelog BUGS gnu org examples/*.java
- #rm -f fr gnu org
+jar: class
+ ln -sf src/fr .
+ ln -sf bundle/${dist}gnu .
+ ln -sf bundle/${dist}org .
+ $(JAR) cfm ivy-java.jar manifest fr/dgac/ivy/*.class fr/dgac/ivy/tools/*.class src/Makefile src/*.java README COPYING.LIB Changelog BUGS gnu org examples/*.java
+ /bin/rm -f gnu org
clean:
( cd src; make clean ;)
diff --git a/java.mk b/java.mk
index 7d9d29c..da521c1 100644
--- a/java.mk
+++ b/java.mk
@@ -11,8 +11,9 @@
#JAVA = kaffe
JAVA = java
#JAVA = gij
-#JAVAC = gcj -C
-JAVAC = javac
+JAVAC = gcj -C --encoding=8859_1 -Wall -g
+#JAVAC = javac
#JAVAC = /usr/local/j2sdk1.4.2/bin/javac
-#JAVACOPTS = --encoding=8859_1 -Wall -g
+#JAVACOPTS =
+#JAVACOPTS = -target 1.2
JAR = jar