summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Johnson <mjj29@hecate.trinhall.cam.ac.uk>2006-12-22 15:30:32 +0000
committerMatthew Johnson <mjj29@hecate.trinhall.cam.ac.uk>2006-12-22 15:30:32 +0000
commitc3dde281ce9651ac70267b17f1ad10e2b1e46981 (patch)
treee76aaec8581cdfa26eadb79c3664b0a90a294d4f /Makefile
parent1f5ce0023421fa6988879ee598bf58300193c838 (diff)
more updates
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 4e01a29..e464cc7 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,6 @@ MAKE?=make
# Program parameters
CPFLAG?=-classpath
JCFLAGS?=-Xlint:all -O -g:none
-JCFLAGS+=-cp classes:$(CLASSPATH):$(JAVAUNIXJARDIR)/unix.jar
JFLAGS+=-Djava.library.path=$(JAVAUNIXLIBDIR)
# Source/Class locations
@@ -39,6 +38,7 @@ MANPREFIX?=$(PREFIX)/share/man/man1
JAVAUNIXLIBDIR?=/usr/lib/jni
# Installation directory of the java-unix jars
JAVAUNIXJARDIR?=/usr/share/java
+DEBUG=enable
# Version numbering
VERSION = 1.13
@@ -65,7 +65,7 @@ viewerclasses: .viewerclasses
touch .viewerclasses
.classes: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java $(SRCDIR)/dbus/exceptions/*.java $(SRCDIR)/dbus/types/*.java $(SRCDIR)/dbus/bin/*.java
mkdir -p classes
- $(JAVAC) -d classes $(JCFLAGS) $^
+ $(JAVAC) -d classes -cp classes:${JAVAUNIXJARDIR}/unix.jar:${JAVAUNIXJARDIR}/debug-$(DEBUG).jar:${JAVAUNIXJARDIR}/hexdump.jar:$(CLASSPATH) $(JCFLAGS) $^
touch .classes
libdbus-java-$(VERSION).jar: .classes