X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=bindings%2Fjava%2FMakefile.am;h=8d2e49d7654072ccfb2478cb53bbbdd028ce8c8c;hb=98e2a7f60066d1e1880de632f66a79764776812c;hp=6eead28e38b4472b7c2d2c738f04b7f5b1f5d097;hpb=0e187c2e852386f767305e69d26fc020fc31d5e8;p=collectd.git

diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index 6eead28e..8d2e49d7 100644
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -17,19 +17,37 @@ EXTRA_DIST = org/collectd/api/CollectdConfigInterface.java \
 	     org/collectd/api/OConfigItem.java \
 	     org/collectd/api/OConfigValue.java \
 	     org/collectd/api/PluginData.java \
-	     org/collectd/api/ValueList.java
+	     org/collectd/api/ValueList.java \
+	     org/collectd/java/GenericJMXConfConnection.java \
+	     org/collectd/java/GenericJMXConfMBean.java \
+	     org/collectd/java/GenericJMXConfValue.java \
+	     org/collectd/java/GenericJMX.java \
+	     org/collectd/java/JMXMemory.java
 
-java-build-stamp: org/collectd/api/*.java
-	$(JAVAC) -d "$(builddir)" "$(srcdir)/org/collectd/api"/*.java
+java-build-stamp: $(srcdir)/org/collectd/api/*.java $(srcdir)/org/collectd/java/*.java
+	$(JAVAC) -d "." "$(srcdir)/org/collectd/api"/*.java
+	$(JAVAC) -d "." "$(srcdir)/org/collectd/java"/*.java
+	mkdir -p .libs
+	$(JAR) cf .libs/collectd-api.jar "org/collectd/api"/*.class
+	$(JAR) cf .libs/generic-jmx.jar "org/collectd/java"/*.class
 	touch "$@"
 
 all-local: java-build-stamp
 
 install-exec-local: java-build-stamp
-	mkdir -p "$(pkglibdir)/java/org/collectd/api"
-	$(INSTALL) -m 644 "$(builddir)/org/collectd/api"/*.class \
-		"$(DESTDIR)$(pkglibdir)/java/org/collectd/api/"
+	mkdir -p "$(DESTDIR)$(pkgdatadir)/java"
+	$(INSTALL) -m 644 .libs/collectd-api.jar \
+		"$(DESTDIR)$(pkgdatadir)/java"
+	$(INSTALL) -m 644 .libs/generic-jmx.jar \
+		"$(DESTDIR)$(pkgdatadir)/java"
+
+uninstall-local:
+	rm -f "$(DESTDIR)$(pkgdatadir)/java/collectd-api.jar"
+	rm -f "$(DESTDIR)$(pkgdatadir)/java/generic-jmx.jar"
+	rmdir "$(DESTDIR)$(pkgdatadir)/java" || true
 
 clean-local:
-	rm -f "$(builddir)/org/collectd/api"/*.class
-	rm -f "$(builddir)/java-build-stamp"
+	rm -f "org/collectd/api"/*.class
+	rm -f "org/collectd/java"/*.class
+	rm -f .libs
+	rm -f "java-build-stamp"