[Ganglia-svn] SF.net SVN: ganglia:[2018] trunk/monitor-core/gmond

[<d_p...@us...>]

Revision: 2018
          http://ganglia.svn.sourceforge.net/ganglia/?rev=2018&view=rev
Author:   d_pocock
Date:     2009-08-10 16:07:17 +0000 (Mon, 10 Aug 2009)

Log Message:
-----------
Make mod_multicpu available in static builds, tested with Cygwin

Modified Paths:
--------------
    trunk/monitor-core/gmond/Makefile.am
    trunk/monitor-core/gmond/modules/cpu/Makefile.am

Modified: trunk/monitor-core/gmond/Makefile.am
===================================================================
--- trunk/monitor-core/gmond/Makefile.am	2009-08-10 15:56:19 UTC (rev 2017)
+++ trunk/monitor-core/gmond/Makefile.am	2009-08-10 16:07:17 UTC (rev 2018)
@@ -10,6 +10,7 @@
          modules/cpu/mod_cpu.lo modules/cpu/mod_load.lo \
          modules/memory/mod_mem.lo modules/network/mod_net.lo \
          modules/system/mod_proc.lo modules/system/mod_sys.lo \
+         modules/system/mod_multicpu.lo \
          $(MOD_GSTATUS) @STATIC_USER_MODULES@
 GLDFLAGS = -static @EXPORT_SYMBOLS@
 if BUILD_PYTHON

Modified: trunk/monitor-core/gmond/modules/cpu/Makefile.am
===================================================================
--- trunk/monitor-core/gmond/modules/cpu/Makefile.am	2009-08-10 15:56:19 UTC (rev 2017)
+++ trunk/monitor-core/gmond/modules/cpu/Makefile.am	2009-08-10 16:07:17 UTC (rev 2018)
@@ -1,9 +1,14 @@
 AM_CFLAGS  = -D_LARGEFILE64_SOURCE -I$(top_builddir)/include -I$(top_builddir)/libmetrics -I$(top_builddir)/lib 
 
+EXTRA_DIST = ../conf.d/multicpu.conf
+
 if STATIC_BUILD
-noinst_LTLIBRARIES    = libmodcpu.la
+noinst_LTLIBRARIES    = libmodcpu.la libmodmulticpu.la
 libmodcpu_la_SOURCES = mod_cpu.c mod_load.c 
 libmodcpu_la_LDFLAGS = -export-all-symbols
+libmodmulticpu_la_SOURCES = mod_multicpu.c
+libmodmulticpu_la_LDFLAGS = -export-all-symbols
+
 else
 pkglib_LTLIBRARIES    = modmulticpu.la modcpu.la modload.la
 
@@ -18,7 +23,6 @@
 modload_la_LDFLAGS = -module -avoid-version
 modload_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
 
-EXTRA_DIST = ../conf.d/multicpu.conf
 endif
 
 INCLUDES = @APR_INCLUDES@


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.