projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2806 from rorysexton/dev_turbostat_plugin
[collectd.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
266ff10
..
f929ffc
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-127,7
+127,7
@@
bin_PROGRAMS = \
endif # BUILD_WIN32
endif # BUILD_WIN32
-
EXTRA
_LTLIBRARIES = \
+
noinst
_LTLIBRARIES = \
libavltree.la \
libcmds.la \
libcommon.la \
libavltree.la \
libcmds.la \
libcommon.la \
@@
-599,11
+599,7
@@
test_utils_oauth_LDADD = \
liboauth.la \
libcommon.la \
libplugin_mock.la
liboauth.la \
libcommon.la \
libplugin_mock.la
-endif
-endif
-endif
-if BUILD_WITH_LIBCURL
noinst_LTLIBRARIES += libgce.la
libgce_la_SOURCES = \
src/utils_gce.c \
noinst_LTLIBRARIES += libgce.la
libgce_la_SOURCES = \
src/utils_gce.c \
@@
-614,6
+610,8
@@
libgce_la_CPPFLAGS = \
libgce_la_LIBADD = \
$(BUILD_WITH_LIBCURL_LIBS)
endif
libgce_la_LIBADD = \
$(BUILD_WITH_LIBCURL_LIBS)
endif
+endif
+endif
if BUILD_WITH_LIBYAJL2
noinst_LTLIBRARIES += libformat_stackdriver.la
if BUILD_WITH_LIBYAJL2
noinst_LTLIBRARIES += libformat_stackdriver.la
@@
-1581,7
+1579,7
@@
python_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBPYTHON_LDFLAGS)
endif
if HAVE_LIBMNL
endif
if HAVE_LIBMNL
-
EXTRA
_LTLIBRARIES += libtaskstats.la
+
noinst
_LTLIBRARIES += libtaskstats.la
libtaskstats_la_SOURCES = \
src/utils_taskstats.c \
src/utils_taskstats.h
libtaskstats_la_SOURCES = \
src/utils_taskstats.c \
src/utils_taskstats.h