[java-atk-wrapper] Allow building outside source tree

[Federico Mena Quintero <federico src gnome org>]

commit 51a19d350d0c754b4973b156197bc35e0773ef58
Author: Fridrich Štrba <fridrich strba bluewin ch>
Date:   Mon Nov 6 08:47:16 2017 +0100

    Allow building outside source tree

 configure.ac                                | 3 ++-
 wrapper/Makefile.am                         | 3 ++-
 wrapper/org/GNOME/Accessibility/Makefile.am | 8 ++------
 3 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4f6d4ab..fbd8211 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,7 @@ AC_ARG_WITH([jdk_auto_detect],
             [],
             [with_jdk_auto_detect=yes])
 if test "x$with_jdk_auto_detect" = "xyes"; then
-  `javac -nowarn $JAVACFLAGS -classpath $CUR_DIR/wrapper/org/GNOME/Accessibility $CUR_DIR/JavaInfo.java`
+  `javac -nowarn $JAVACFLAGS ${srcdir}/JavaInfo.java -d .`
   JDK_SRC=`java JavaInfo`
   JAVA_HOME="${JDK_SRC}/jre"
   if test ! -d ${JAVA_HOME}; then
@@ -182,6 +182,7 @@ AC_CONFIG_FILES([
     wrapper/Makefile
     wrapper/org/Makefile
     wrapper/org/GNOME/Makefile
+    wrapper/org/GNOME/Accessibility/AtkWrapper.java
     wrapper/org/GNOME/Accessibility/Makefile
 ])
 AC_OUTPUT
diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am
index 42f3ff2..f328e95 100644
--- a/wrapper/Makefile.am
+++ b/wrapper/Makefile.am
@@ -12,7 +12,7 @@ EXTRA_DIST = $(properties_DATA) \
             manifest.txt
 
 $(JARFILES) : $(DEP_CLASSES)
-       $(JAR) cfm $(JARFILES) manifest.txt org/GNOME/Accessibility/*.class
+       $(JAR) cfm $(JARFILES) $(srcdir)/manifest.txt org/GNOME/Accessibility/*.class
 
 install-data-local : all-local
        $(mkinstalldirs) $(DESTDIR)$(propertiesdir) $(DESTDIR)$(java_atk_wrapperdir)
@@ -22,4 +22,5 @@ install-data-local : all-local
 all-local : $(DATA) $(JARFILES)
 
 clean-local:
+       $(RM) *.class
        rm -f $(JARFILES)
diff --git a/wrapper/org/GNOME/Accessibility/Makefile.am b/wrapper/org/GNOME/Accessibility/Makefile.am
index 9abf7be..7f1ea85 100644
--- a/wrapper/org/GNOME/Accessibility/Makefile.am
+++ b/wrapper/org/GNOME/Accessibility/Makefile.am
@@ -6,12 +6,8 @@ EXTRA_DIST=$(JAVA_SRC) AtkWrapper.java.in $(srcdir)/*.java
 
 all-local: $(BUILD_CLASSES)
 
-AtkWrapper.java : AtkWrapper.java.in
-       sed -e "s;\@XPROP\@;${XPROP};g" \
-               < $< >$@
-
-%.class : %.java
-       CLASSPATH=$(top_srcdir)/wrapper $(JAVAC) $(JAVACFLAGS) -d $(top_builddir)/wrapper $<
+%.class : %.java AtkWrapper.java
+       $(JAVAC) -cp $(top_builddir)/wrapper -sourcepath $(top_srcdir)/wrapper:$(top_builddir)/wrapper 
$(JAVACFLAGS) -d $(top_builddir)/wrapper $<
 
 clean-local:
        $(RM) *.class