projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build system: Properly integrated src/libesl/.
[collectd.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
d8c6bf6
..
dc8893c
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,4
+1,7
@@
SUBDIRS = libcollectdclient
SUBDIRS = libcollectdclient
+if BUILD_PLUGIN_FREESWITCH
+SUBDIRS += libesl
+endif
if BUILD_WITH_OWN_LIBIPTC
SUBDIRS += libiptc
endif
if BUILD_WITH_OWN_LIBIPTC
SUBDIRS += libiptc
endif
@@
-328,8
+331,10
@@
endif
if BUILD_PLUGIN_FREESWITCH
pkglib_LTLIBRARIES += freeswitch.la
freeswitch_la_SOURCES = freeswitch.c
if BUILD_PLUGIN_FREESWITCH
pkglib_LTLIBRARIES += freeswitch.la
freeswitch_la_SOURCES = freeswitch.c
+freeswitch_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/libesl
freeswitch_la_LDFLAGS = -module -avoid-version
freeswitch_la_LDFLAGS = -module -avoid-version
-freeswitch_la_LIBADD = -lesl -Llibesl
+freeswitch_la_LIBADD = libesl/libesl.la
+freeswitch_la_DEPENDENCIES = libesl/libesl.la
collectd_LDADD += "-dlopen" freeswitch.la
collectd_DEPENDENCIES += freeswitch.la
endif
collectd_LDADD += "-dlopen" freeswitch.la
collectd_DEPENDENCIES += freeswitch.la
endif