[java-libglom] Fix the tests build.

[Murray Cumming <murrayc src gnome org>]

commit 6a35e310e3ff9f7174a2b413b1da2e5876ea046c
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Mar 12 17:18:54 2012 +0100

    Fix the tests build.
    
    * Makefile.am: Adapt to the latest API.

 ChangeLog                                          |   12 ++++++++++++
 Makefile.am                                        |    5 ++++-
 .../java/org/glom/libglom/tests/DocumentTest.java  |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 08fee1b..4c08428 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2012-03-12  Murray Cumming  <murrayc murrayc com>
 
+	Fix the tests build.
+
+	* Makefile.am: Adapt to the latest API.
+
+2012-03-12  Murray Cumming  <murrayc murrayc com>
+
+	Fix the build, at least with my version of autoconf.
+
+	* Makefile.am:
+
+2012-03-12  Murray Cumming  <murrayc murrayc com>
+
 	Adapt to the latest libglom API from git master.
 
 	* src/glom.i: Add an ignore for sql_find() because it uses
diff --git a/Makefile.am b/Makefile.am
index 90376ee..59fd41f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -146,7 +146,10 @@ src/glom_wrap.cc: $(swig_dependencies)
 	sed -i -e "s/public final/public synchronized final/" \
 	  src/main/java/org/glom/libglom/GlomJNI.java
 
-$(jarfile): classdist_noinst.stamp
+# This use of the .stamp files feels like a hack.
+# This used to depend on  classdist_noinst.stamp but that is no longer generated,
+# at least with autoconf 2.68. murrayc.
+$(jarfile): classnoinst.stamp
 	$(JAR) cf $(JARFLAGS) $(top_builddir)/$(jarfile) org
 
 all-local: $(jarfile) $(doc_jarfile) $(sources_jarfile)  tests-and-examples.stamp
diff --git a/src/test/java/org/glom/libglom/tests/DocumentTest.java b/src/test/java/org/glom/libglom/tests/DocumentTest.java
index d25bb92..0a79349 100644
--- a/src/test/java/org/glom/libglom/tests/DocumentTest.java
+++ b/src/test/java/org/glom/libglom/tests/DocumentTest.java
@@ -332,7 +332,7 @@ public class DocumentTest {
 		assertTrue(fieldGroupBy != null);
 		assertThat(fieldGroupBy.get_name(), is("artist_id"));
 
-		LayoutGroup groupSecondaries = groupby.get_group_secondary_fields();
+		LayoutGroup groupSecondaries = groupby.get_secondary_fields();
 		assertTrue(groupSecondaries != null);
 	}