forked from pool/collectd
321fa44ea3
- packaging:
* removed patches:
- collectd-new_libstatgrab.patch (fixed upstream)
- collectd-lib64.patch (fixed upstream)
- collectd-fix_libltdl_autoreconf.patch (fixed upstream)
* updated patches:
- collectd-javac_target.patch
- collectd-version.patch
- upstream update release 2015-05-27, Version 5.5.0
OBS-URL: https://build.opensuse.org/request/show/353930
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=131
31 lines
1.4 KiB
Diff
31 lines
1.4 KiB
Diff
diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
|
|
index 8d2e49d..549d81a 100644
|
|
--- a/bindings/java/Makefile.am
|
|
+++ b/bindings/java/Makefile.am
|
|
@@ -25,8 +25,8 @@ EXTRA_DIST = org/collectd/api/CollectdConfigInterface.java \
|
|
org/collectd/java/JMXMemory.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
|
|
+ $(JAVAC) $(JAVAC_TARGET) -d "." "$(srcdir)/org/collectd/api"/*.java
|
|
+ $(JAVAC) $(JAVAC_TARGET) -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
|
|
diff --git a/bindings/java/Makefile.in b/bindings/java/Makefile.in
|
|
index 1c57558..c8ab086 100644
|
|
--- a/bindings/java/Makefile.in
|
|
+++ b/bindings/java/Makefile.in
|
|
@@ -597,8 +597,8 @@ uninstall-am: uninstall-local
|
|
|
|
|
|
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
|
|
+ $(JAVAC) $(JAVAC_TARGET) -d "." "$(srcdir)/org/collectd/api"/*.java
|
|
+ $(JAVAC) $(JAVAC_TARGET) -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
|