--- brltty-3.9/Bindings/Java/BrlapiException.java.javadoc	2007-10-17 17:19:30.000000000 +0200

+++ brltty-3.9/Bindings/Java/BrlapiException.java	2008-01-07 12:01:06.000000000 +0100

@@ -17,6 +17,7 @@

  *

  * This software is maintained by Dave Mielke <dave@mielke.cc>.

  */

+package cc.mielke.brltty;

 public class BrlapiException extends Exception {

   static final long serialVersionUID = 0;

--- brltty-3.9/Bindings/Java/Makefile.in.javadoc	2007-10-17 17:19:30.000000000 +0200

+++ brltty-3.9/Bindings/Java/Makefile.in	2008-01-07 12:16:14.000000000 +0100

@@ -48,17 +48,12 @@

 JAVA_JAR_FILE = $(API_NAME).jar

 jar: $(JAVA_JAR_FILE)

-API_CLASSES = Brlapi.class BrlapiNative.class BrlapiError.class BrlapiException.class BrlapiSettings.class BrlapiWriteArguments.class BrlapiSize.class BrlapiKey.class

-ALL_CLASSES = $(API_CLASSES) ApiTest.class

+$(JAVA_JAR_FILE): apiclasses.made

+	$(JAR) cf $@ -C classes .

-$(JAVA_JAR_FILE): $(API_CLASSES)

-	$(JAR) cf $@ Brlapi*.class

-

-$(ALL_CLASSES): $(SRC_DIR)/*.java BrlapiConstants.class

-	$(JAVAC) -d . -classpath . $(SRC_DIR)/*.java

-

-BrlapiConstants.class: BrlapiConstants.java

-	$(JAVAC) BrlapiConstants.java

+apiclasses.made: $(SRC_DIR)/Brlapi*.java BrlapiConstants.java

+	$(JAVAC) -d classes -classpath . $(SRC_DIR)/Brlapi*.java

+	touch $@

 BrlapiConstants.java: $(CONSTANTS_SCRIPTS) $(CONSTANTS_SOURCES)

 	$(AWK) $(CONSTANTS_OPTIONS) $(CONSTANTS_SOURCES) >$@

@@ -66,12 +61,14 @@

 doc: javadoc.made

 javadoc.made: $(SRC_DIR)/*.java BrlapiConstants.java

-	$(JAVADOC) -quiet -d . -author -version -use $(SRC_DIR)/*.java BrlapiConstants.java

+	$(JAVADOC) -quiet -d doc -author -version -use $(SRC_DIR)/*.java BrlapiConstants.java

 	touch $@

 clean::

-	-rm -f BrlapiConstants.java *.class $(JAVA_JAR_FILE) $(JAVA_JNI_FILE)

-	-rm -f javadoc.made package-list *.css *.html

+	-rm -f BrlapiConstants.java apiclasses.made $(JAVA_JAR_FILE) $(JAVA_JNI_FILE)

+	-rm -f -r classes

+	-rm -f javadoc.made

+	-rm -f -r doc

 	-rm -f -r resources

 	-rm -f gjdoc.properties JAVADOC.PLACEHOLDER

--- brltty-3.9/Bindings/Java/ApiTest.java.javadoc	2007-10-17 17:19:30.000000000 +0200

+++ brltty-3.9/Bindings/Java/ApiTest.java	2008-01-07 12:01:06.000000000 +0100

@@ -17,6 +17,7 @@

  *

  * This software is maintained by Dave Mielke <dave@mielke.cc>.

  */

+package cc.mielke.brltty;

 public class ApiTest {

   public static void main(String argv[]) {

--- brltty-3.9/Bindings/Java/BrlapiWriteArguments.java.javadoc	2007-10-17 17:19:30.000000000 +0200

+++ brltty-3.9/Bindings/Java/BrlapiWriteArguments.java	2008-01-07 12:01:06.000000000 +0100

@@ -17,6 +17,7 @@

  *

  * This software is maintained by Dave Mielke <dave@mielke.cc>.

  */

+package cc.mielke.brltty;

 public class BrlapiWriteArguments {

   public int displayNumber = Brlapi.DISPLAY_DEFAULT;

--- brltty-3.9/Bindings/Java/BrlapiSettings.java.javadoc	2007-10-17 17:19:30.000000000 +0200

+++ brltty-3.9/Bindings/Java/BrlapiSettings.java	2008-01-07 12:01:06.000000000 +0100

@@ -17,6 +17,7 @@

  *

  * This software is maintained by Dave Mielke <dave@mielke.cc>.

  */

+package cc.mielke.brltty;

 public class BrlapiSettings {

   public String host;

--- brltty-3.9/Bindings/Java/BrlapiError.java.javadoc	2007-10-17 17:19:30.000000000 +0200

+++ brltty-3.9/Bindings/Java/BrlapiError.java	2008-01-07 12:01:06.000000000 +0100

@@ -17,6 +17,7 @@

  *

  * This software is maintained by Dave Mielke <dave@mielke.cc>.

  */

+package cc.mielke.brltty;

 public class BrlapiError extends Exception {

   static final long serialVersionUID = 0;

--- brltty-3.9/Bindings/Java/constants.awk.javadoc	2007-10-17 17:19:30.000000000 +0200

+++ brltty-3.9/Bindings/Java/constants.awk	2008-01-07 12:01:06.000000000 +0100

@@ -19,6 +19,7 @@

 ###############################################################################

 BEGIN {

+  print "package cc.mielke.brltty;"

   print "public interface BrlapiConstants {"

 }

--- brltty-3.9/Bindings/Java/BrlapiNative.java.javadoc	2007-10-17 17:19:30.000000000 +0200

+++ brltty-3.9/Bindings/Java/BrlapiNative.java	2008-01-07 12:01:06.000000000 +0100

@@ -17,6 +17,7 @@

  *

  * This software is maintained by Dave Mielke <dave@mielke.cc>.

  */

+package cc.mielke.brltty;

 public class BrlapiNative {

   protected long handle;

--- brltty-3.9/Bindings/Java/BrlapiKey.java.javadoc	2007-10-17 17:19:30.000000000 +0200

+++ brltty-3.9/Bindings/Java/BrlapiKey.java	2008-01-07 12:01:06.000000000 +0100

@@ -17,6 +17,7 @@

  *

  * This software is maintained by Dave Mielke <dave@mielke.cc>.

  */

+package cc.mielke.brltty;

 public class BrlapiKey {

   protected final long code;

--- brltty-3.9/Bindings/Java/Brlapi.java.javadoc	2007-10-17 17:19:30.000000000 +0200

+++ brltty-3.9/Bindings/Java/Brlapi.java	2008-01-07 12:01:06.000000000 +0100

@@ -17,6 +17,7 @@

  *

  * This software is maintained by Dave Mielke <dave@mielke.cc>.

  */

+package cc.mielke.brltty;

 public class Brlapi extends BrlapiNative implements BrlapiConstants {

   protected final BrlapiSettings settings;

--- brltty-3.9/Bindings/Java/BrlapiSize.java.javadoc	2007-10-17 17:19:30.000000000 +0200

+++ brltty-3.9/Bindings/Java/BrlapiSize.java	2008-01-07 12:01:06.000000000 +0100

@@ -17,6 +17,7 @@

  *

  * This software is maintained by Dave Mielke <dave@mielke.cc>.

  */

+package cc.mielke.brltty;

 public class BrlapiSize {

   protected final int width;