X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=bindings%2Fjava%2FMakefile.am;h=8d2e49d7654072ccfb2478cb53bbbdd028ce8c8c;hp=d3315accc5b896a0d4b019a6813cfb681ba954cb;hb=ad0a12907bf80b4f0deec217b8379dd08c490dbc;hpb=19a08d266f623d3697b5ca55689bd57eeaae46a6

diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index d3315acc..8d2e49d7 100644
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -24,22 +24,30 @@ EXTRA_DIST = org/collectd/api/CollectdConfigInterface.java \
 	     org/collectd/java/GenericJMX.java \
 	     org/collectd/java/JMXMemory.java
 
-java-build-stamp: 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 "$(DESTDIR)$(pkgdatadir)/java/org/collectd/api"
-	$(INSTALL) -m 644 "org/collectd/api"/*.class \
-		"$(DESTDIR)$(pkgdatadir)/java/org/collectd/api/"
-	mkdir -p "$(DESTDIR)$(pkgdatadir)/java/org/collectd/java"
-	$(INSTALL) -m 644 "org/collectd/java"/*.class \
-		"$(DESTDIR)$(pkgdatadir)/java/org/collectd/java/"
+	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 "org/collectd/api"/*.class
 	rm -f "org/collectd/java"/*.class
+	rm -f .libs
 	rm -f "java-build-stamp"