X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Makefile.am;h=529d4a92095a1aa02efd8deaade22ee99e72993c;hb=a05589a42ad5bce31e134a598a3dfa4a8add1255;hp=ebba2f341517594d27a42dd6e7e424f641b07c95;hpb=662c44a84ae3daecd4ffdea940fffce35a41b52a;p=collectd.git diff --git a/Makefile.am b/Makefile.am index ebba2f34..529d4a92 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1389,9 +1389,6 @@ python_la_SOURCES = \ src/pyvalues.c \ src/cpython.h python_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBPYTHON_CPPFLAGS) -if COMPILER_IS_GCC -python_la_CPPFLAGS += -fno-strict-aliasing -Wno-strict-aliasing -endif python_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBPYTHON_LDFLAGS) endif @@ -1493,9 +1490,9 @@ endif if BUILD_PLUGIN_SNMP_AGENT pkglib_LTLIBRARIES += snmp_agent.la snmp_agent_la_SOURCES = src/snmp_agent.c -snmp_agent_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBNETSNMP_CPPFLAGS) -snmp_agent_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBNETSNMP_LDFLAGS) -snmp_agent_la_LIBADD = $(BUILD_WITH_LIBNETSNMP_LIBS) +snmp_agent_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBNETSNMPAGENT_CPPFLAGS) +snmp_agent_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBNETSNMPAGENT_LDFLAGS) +snmp_agent_la_LIBADD = $(BUILD_WITH_LIBNETSNMPAGENT_LIBS) endif if BUILD_PLUGIN_STATSD @@ -2019,10 +2016,10 @@ dist_noinst_JAVA = \ bindings/java/org/collectd/java/GenericJMXConfValue.java \ bindings/java/org/collectd/java/JMXMemory.java -collectd-api.jar: classnoinst.stamp +collectd-api.jar: $(JAVA_TIMESTAMP_FILE) $(JAR) cf $(JARFLAGS) $@ org/collectd/api/*.class -generic-jmx.jar: classnoinst.stamp +generic-jmx.jar: $(JAVA_TIMESTAMP_FILE) $(JAR) cf $(JARFLAGS) $@ org/collectd/java/*.class jar_DATA = collectd-api.jar generic-jmx.jar