projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1bde614
)
bring in AM_CPPFLAGS
author
Pierre-Yves Ritschard
<pyr@spootnik.org>
Fri, 25 Jul 2014 14:00:22 +0000
(16:00 +0200)
committer
Pierre-Yves Ritschard
<pyr@spootnik.org>
Fri, 25 Jul 2014 14:00:22 +0000
(16:00 +0200)
src/Makefile.am
patch
|
blob
|
history
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
92ccccb
..
0dfe1fa
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-133,9
+133,9
@@
collectd_tg_LDADD += libcollectdclient/libcollectdclient.la
collectd_tg_DEPENDENCIES = libcollectdclient/libcollectdclient.la
collectd_tg_DEPENDENCIES = libcollectdclient/libcollectdclient.la
-pkglib_LTLIBRARIES =
+pkglib_LTLIBRARIES =
-BUILT_SOURCES =
+BUILT_SOURCES =
CLEANFILES =
if BUILD_PLUGIN_AGGREGATION
CLEANFILES =
if BUILD_PLUGIN_AGGREGATION
@@
-273,7
+273,7
@@
pkglib_LTLIBRARIES += cpu.la
cpu_la_SOURCES = cpu.c
cpu_la_CFLAGS = $(AM_CFLAGS)
cpu_la_LDFLAGS = -module -avoid-version
cpu_la_SOURCES = cpu.c
cpu_la_CFLAGS = $(AM_CFLAGS)
cpu_la_LDFLAGS = -module -avoid-version
-cpu_la_LIBADD =
+cpu_la_LIBADD =
if BUILD_WITH_LIBKSTAT
cpu_la_LIBADD += -lkstat
endif
if BUILD_WITH_LIBKSTAT
cpu_la_LIBADD += -lkstat
endif
@@
-371,7
+371,7
@@
pkglib_LTLIBRARIES += disk.la
disk_la_SOURCES = disk.c
disk_la_CFLAGS = $(AM_CFLAGS)
disk_la_LDFLAGS = -module -avoid-version
disk_la_SOURCES = disk.c
disk_la_CFLAGS = $(AM_CFLAGS)
disk_la_LDFLAGS = -module -avoid-version
-disk_la_LIBADD =
+disk_la_LIBADD =
if BUILD_WITH_LIBKSTAT
disk_la_LIBADD += -lkstat
endif
if BUILD_WITH_LIBKSTAT
disk_la_LIBADD += -lkstat
endif
@@
-382,7
+382,7
@@
if BUILD_WITH_LIBIOKIT
disk_la_LDFLAGS += -framework IOKit
endif
if BUILD_WITH_LIBSTATGRAB
disk_la_LDFLAGS += -framework IOKit
endif
if BUILD_WITH_LIBSTATGRAB
-disk_la_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
+disk_la_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
disk_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
endif
if BUILD_WITH_PERFSTAT
disk_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
endif
if BUILD_WITH_PERFSTAT
@@
-582,7
+582,7
@@
pkglib_LTLIBRARIES += log_logstash.la
log_logstash_la_SOURCES = log_logstash.c
log_logstash_la_CFLAGS = $(AM_CFLAGS)
log_logstash_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBYAJL_LDFLAGS)
log_logstash_la_SOURCES = log_logstash.c
log_logstash_la_CFLAGS = $(AM_CFLAGS)
log_logstash_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBYAJL_LDFLAGS)
-log_logstash_la_CPPFLAGS = $(BUILD_WITH_LIBYAJL_CPPFLAGS)
+log_logstash_la_CPPFLAGS = $(
AM_CPPFLAGS) $(
BUILD_WITH_LIBYAJL_CPPFLAGS)
log_logstash_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS)
collectd_LDADD += "-dlopen" log_logstash.la
collectd_DEPENDENCIES += log_logstash.la
log_logstash_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS)
collectd_LDADD += "-dlopen" log_logstash.la
collectd_DEPENDENCIES += log_logstash.la
@@
-873,7
+873,7
@@
if BUILD_PLUGIN_OLSRD
pkglib_LTLIBRARIES += olsrd.la
olsrd_la_SOURCES = olsrd.c
olsrd_la_LDFLAGS = -module -avoid-version
pkglib_LTLIBRARIES += olsrd.la
olsrd_la_SOURCES = olsrd.c
olsrd_la_LDFLAGS = -module -avoid-version
-olsrd_la_LIBADD =
+olsrd_la_LIBADD =
if BUILD_WITH_LIBSOCKET
olsrd_la_LIBADD += -lsocket
endif
if BUILD_WITH_LIBSOCKET
olsrd_la_LIBADD += -lsocket
endif