Automatically generate list of built java sources

2 files changed, 15 insertions, 2 deletions

diff --git a/java/Makefile.am b/java/Makefile.am
index 068540c3..51cd3b58 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -20,8 +20,12 @@ builddir ?= $(top_builddir)/java
 
 java_prefix = com/redhat/et/libguestfs
 
+# Pull in automatically generated built sources
+include $(builddir)/Makefile.inc
+
 java_sources = \
-	$(java_prefix)/*.java
+	$(java_built_sources) \
+	com/redhat/et/libguestfs/LibGuestFSException.java
 
 java_tests = \
 	Bindtests.java \
@@ -35,7 +39,7 @@ EXTRA_DIST = \
 	run-bindtests \
 	run-java-tests
 
-CLEANFILES = doc-stamp
+CLEANFILES = doc-stamp $(builddir)/com/redhat/et/libguestfs/*.class com_redhat_et_libguestfs_GuestFS.h *.class *.jar api/com/redhat/et/libguestfs/*.html api/*
 
 if HAVE_JAVA
 
diff --git a/src/generator.ml b/src/generator.ml
index 2446299f..8c864f0d 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -8340,6 +8340,15 @@ Run it from the top source directory using the command
       close ();
   ) java_structs;
 
+  let close = output_to "java/Makefile.inc" in
+  pr "java_built_sources =";
+  List.iter (
+    fun (typ, jtyp) ->
+        pr " com/redhat/et/libguestfs/%s.java" jtyp;
+  ) java_structs;
+  pr " com/redhat/et/libguestfs/GuestFS.java\n";
+  close ();
+
   let close = output_to "java/com_redhat_et_libguestfs_GuestFS.c" in
   generate_java_c ();
   close ();