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 #1738 from tokkee/sh/silent
[collectd.git]
/
src
/
daemon
/
Makefile.am
diff --git
a/src/daemon/Makefile.am
b/src/daemon/Makefile.am
index
cdd927b
..
d59e823
100644
(file)
--- a/
src/daemon/Makefile.am
+++ b/
src/daemon/Makefile.am
@@
-10,7
+10,7
@@
AM_CPPFLAGS += -DPLUGINDIR='"${pkglibdir}"'
AM_CPPFLAGS += -DPKGDATADIR='"${pkgdatadir}"'
# Link to these libraries..
AM_CPPFLAGS += -DPKGDATADIR='"${pkgdatadir}"'
# Link to these libraries..
-COMMON_LIBS =
+COMMON_LIBS =
$(PTHREAD_LIBS)
if BUILD_WITH_LIBRT
COMMON_LIBS += -lrt
endif
if BUILD_WITH_LIBRT
COMMON_LIBS += -lrt
endif
@@
-23,9
+23,6
@@
endif
if BUILD_WITH_LIBRESOLV
COMMON_LIBS += -lresolv
endif
if BUILD_WITH_LIBRESOLV
COMMON_LIBS += -lresolv
endif
-if BUILD_WITH_LIBPTHREAD
-COMMON_LIBS += -lpthread
-endif
if BUILD_WITH_LIBKSTAT
COMMON_LIBS += -lkstat
endif
if BUILD_WITH_LIBKSTAT
COMMON_LIBS += -lkstat
endif
@@
-33,8
+30,6
@@
if BUILD_WITH_LIBDEVINFO
COMMON_LIBS += -ldevinfo
endif
COMMON_LIBS += -ldevinfo
endif
-AUTOMAKE_OPTIONS = subdir-objects
-
sbin_PROGRAMS = collectd
noinst_LTLIBRARIES = libavltree.la libcommon.la libheap.la libmetadata.la libplugin_mock.la
sbin_PROGRAMS = collectd
noinst_LTLIBRARIES = libavltree.la libcommon.la libheap.la libmetadata.la libplugin_mock.la