[java-atk-wrapper] Minor changes for tarball distribution

[Ke Wang <kewang src gnome org>]

commit ac239b40df99aaae106f9873713752d0b0071c4c
Author: Ke Wang <ke wang sun com>
Date:   Thu Jun 4 14:54:18 2009 +0800

    Minor changes for tarball distribution
---
 INSTALL                                     |    2 +-
 configure.in                                |   10 ++++------
 jni/src/Makefile.am                         |    7 +++++++
 wrapper/Makefile.am                         |   20 +++++++-------------
 wrapper/org/GNOME/Accessibility/Makefile.am |    8 ++++----
 5 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/INSTALL b/INSTALL
index dd367ec..595d1df 100644
--- a/INSTALL
+++ b/INSTALL
@@ -9,7 +9,7 @@ run ./autogen.sh in the java-atk-wrapper directory (this directory),
 Example:
 	./autogen.sh --prefix=/opt/gnome-2.0
 
-You must also include a --with-java-home argument:
+You can also include a --with-java-home argument:
 
 	./autogen.sh --prefix=/opt/gnome-2.0 --with-java-home=/usr/java/j2sdk1.4.0
 
diff --git a/configure.in b/configure.in
index e81d67c..5d51fab 100644
--- a/configure.in
+++ b/configure.in
@@ -34,12 +34,10 @@ if test "x$with_java_home" != "x" ; then
    AC_CHECK_FILE("$JAVA_HOME/bin/java", JAVA="$JAVA_HOME/bin/java",
 		 AC_MSG_ERROR([$JAVA_ERROR_MESSAGE]))
 else
-   AC_MSG_ERROR(["Please provide Java home with --with-java-home argument."])
-fi
-
-AC_CHECK_PROG(JAVA, java, java, no)
-if test "x$JAVA" = xno; then
-  AC_MSG_ERROR([$JAVA_ERROR_MESSAGE])
+   AC_CHECK_PROG(JAVA, java, java, no)
+   if test "x$JAVA" = xno; then
+     AC_MSG_ERROR([$JAVA_ERROR_MESSAGE])
+   fi
 fi
 
 AC_SUBST(JAVA_HOME)
diff --git a/jni/src/Makefile.am b/jni/src/Makefile.am
index 8131702..612501b 100644
--- a/jni/src/Makefile.am
+++ b/jni/src/Makefile.am
@@ -16,6 +16,13 @@ libatk_wrapper_la_SOURCES = AtkWrapper.c \
 			    jawvalue.c \
 			    jawtable.c
 
+include_HEADERS = jni_AtkWrapper.h \
+		  jawimpl.h \
+		  jawobject.h \
+		  jawhyperlink.h \
+		  jawtoplevel.h \
+		  jawutil.h
+
 libatk_wrapper_la_CPPFLAGS = $(JNI_INCLUDES)\
 			     $(JAW_CFLAGS)
 
diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am
index 6e11357..bcfb5df 100644
--- a/wrapper/Makefile.am
+++ b/wrapper/Makefile.am
@@ -1,26 +1,20 @@
 SUBDIRS=org
 JARFILES=java-atk-wrapper.jar
-CLASSES=$(wildcard org/GNOME/*/*.class)
-JAVA_FILES=$(wildcard org/GNOME/*/*.java)
-DEP_CLASSES=$(JAVA_FILES:.java=.class)
+CLASSES=$(wildcard $(srcdir)/org/GNOME/*/*.class)
+JAVA_FILES=$(wildcard $(srcdir)/org/GNOME/*/*.java)
 
-java_atk_wrapperdir = $(prefix)/java/jre/lib/ext
+java_atk_wrapperdir = $(prefix)/share/jar
 java_atk_wrapper_DATA = $(JARFILES)
 
 EXTRA_DIST = $(properties_DATA)
 
-propertiesdir = $(prefix)/java/jre/lib
+propertiesdir = $(prefix)/share/jar
 properties_DATA = accessibility.properties
 
-jar-stamp : jar-stamp
-	echo
-
-$(JARFILES) : jar-stamp $(JAVA_FILES) $(DEP_CLASSES)
-	touch jar-stamp
+$(JARFILES) :
 	$(JAR) cf $(JARFILES) org/GNOME/Accessibility/*.class
 
-$(DEP_CLASSES) :
-	@(cd `dirname $ `; $(MAKE) )
-
 all-local : $(DATA) $(JARFILES)
 
+clean-local:
+	rm $(JARFILES)
diff --git a/wrapper/org/GNOME/Accessibility/Makefile.am b/wrapper/org/GNOME/Accessibility/Makefile.am
index 574df60..8aa2402 100644
--- a/wrapper/org/GNOME/Accessibility/Makefile.am
+++ b/wrapper/org/GNOME/Accessibility/Makefile.am
@@ -1,12 +1,12 @@
-JAVA_SRC=$(wildcard *.java)
-CLASSES=$(patsubst %.java,%.class,$(JAVA_SRC))
+JAVA_SRC=$(wildcard $(srcdir)/*.java)
+CLASSES=$(patsubst $(srcdir)/%.java,%.class,$(JAVA_SRC))
 
 EXTRA_DIST=$(JAVA_SRC)
 
 all-local: $(CLASSES)
 
-%.class : %.java
-	CLASSPATH=$(top_srcdir)/wrapper $(JAVAC) $<
+%.class : $(srcdir)/%.java
+	CLASSPATH=$(top_srcdir)/wrapper $(JAVAC) -d $(top_builddir)/wrapper $<
 
 clean-local:
 	$(RM) *.class