X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=java%2FMakefile.am;h=068540c38f014ad03d0304a21cb9d2fcdd570b44;hb=d7db5317bc4624184fccd816cbacfce3f75cbd27;hp=ea90a4825e53ec0c95961837f1bbaf50fc150d34;hpb=5186251f8f681f2ebb028423bb49a748861fd11e;p=libguestfs.git

diff --git a/java/Makefile.am b/java/Makefile.am
index ea90a48..068540c 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -15,18 +15,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-CPTH = com/redhat/et/libguestfs
+# Old RHEL 5 autoconf doesn't have builddir.
+builddir ?= $(top_builddir)/java
+
+java_prefix = com/redhat/et/libguestfs
 
 java_sources = \
-	$(CPTH)/LibGuestFSException.java \
-	$(CPTH)/IntBool.java \
-	$(CPTH)/PV.java \
-	$(CPTH)/VG.java \
-	$(CPTH)/LV.java \
-	$(CPTH)/Stat.java \
-	$(CPTH)/StatVFS.java \
-	$(CPTH)/Dirent.java \
-	$(CPTH)/GuestFS.java
+	$(java_prefix)/*.java
 
 java_tests = \
 	Bindtests.java \
@@ -50,7 +45,7 @@ libguestfs_jardir = $(JAR_INSTALL_DIR)
 libguestfs_jar_DATA = libguestfs-${VERSION}.jar
 libguestfs_jar_class_files = $(java_sources:.java=.class)
 $(libguestfs_jar_class_files): %.class: %.java
-	$(JAVAC) $(JAVAC_FLAGS) -classpath $(CPTH) $(java_sources)
+	$(JAVAC) $(JAVAC_FLAGS) -d $(builddir) -classpath @srcdir@:$(builddir) -sourcepath @srcdir@:$(builddir) $<
 
 libguestfs-${VERSION}.jar: $(libguestfs_jar_class_files)
 	$(JAR) cf $@ $^
@@ -64,12 +59,12 @@ libguestfs_jni_la_SOURCES = \
 
 libguestfs_jni_la_LIBADD = $(top_builddir)/src/libguestfs.la
 libguestfs_jni_la_LDFLAGS = -version-info $(JNI_VERSION_INFO)
-libguestfs_jni_la_CFLAGS = -Wall -I$(top_builddir)/src $(JNI_CFLAGS)
+libguestfs_jni_la_CFLAGS = -Wall -I$(top_srcdir)/src -I$(top_builddir)/src $(JNI_CFLAGS)
 
 BUILT_SOURCES = com_redhat_et_libguestfs_GuestFS.h
 
-com_redhat_et_libguestfs_GuestFS.h: $(CPTH)/GuestFS.class
-	$(JAVAH) -classpath .:$(CPTH) com.redhat.et.libguestfs.GuestFS
+com_redhat_et_libguestfs_GuestFS.h: $(java_prefix)/GuestFS.class
+	$(JAVAH) -classpath @srcdir@:$(builddir) com.redhat.et.libguestfs.GuestFS
 
 # Documentation.