From f789dde50d334d0926bcdef8235dd9cc17a02dfe Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Tue, 21 Jul 2009 08:43:57 +0200 Subject: [PATCH] Build system: Properly integrated src/libesl/. --- configure.in | 2 +- src/Makefile.am | 7 ++++++- src/libesl/Makefile.am | 23 +++++++++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 src/libesl/Makefile.am diff --git a/configure.in b/configure.in index aa56c020..28f74318 100644 --- a/configure.in +++ b/configure.in @@ -3906,7 +3906,7 @@ AC_SUBST(LCC_VERSION_STRING) AC_CONFIG_FILES(src/libcollectdclient/lcc_features.h) -AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/libiptc/Makefile src/libcollectdclient/Makefile src/libcollectdclient/libcollectdclient.pc src/liboconfig/Makefile bindings/Makefile bindings/java/Makefile) +AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/libesl/Makefile src/libiptc/Makefile src/libcollectdclient/Makefile src/libcollectdclient/libcollectdclient.pc src/liboconfig/Makefile bindings/Makefile bindings/java/Makefile) if test "x$with_librrd" = "xyes" \ && test "x$librrd_threadsafe" != "xyes" diff --git a/src/Makefile.am b/src/Makefile.am index d8c6bf62..dc8893c5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,7 @@ SUBDIRS = libcollectdclient +if BUILD_PLUGIN_FREESWITCH +SUBDIRS += libesl +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 +freeswitch_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/libesl 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 diff --git a/src/libesl/Makefile.am b/src/libesl/Makefile.am new file mode 100644 index 00000000..b6e254ad --- /dev/null +++ b/src/libesl/Makefile.am @@ -0,0 +1,23 @@ +AUTOMAKE_OPTIONS = foreign no-dependencies + +#EXTRA_DIST = libiptc.c README.collectd + +if COMPILER_IS_GCC +AM_CFLAGS = -Wall -Werror +endif + +noinst_LTLIBRARIES = libesl.la + +libesl_la_SOURCES = esl.c \ + esl_config.c \ + esl_config.h \ + esl_event.c \ + esl_event.h \ + esl.h \ + esl_oop.cpp \ + esl_oop.h \ + esl_threadmutex.c \ + esl_threadmutex.h +#libesl_la_CFLAGS = -I$(KERNEL_DIR)/include + + -- 2.11.0