gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r25506 - gnunet/src/sysmon


From: gnunet
Subject: [GNUnet-SVN] r25506 - gnunet/src/sysmon
Date: Mon, 17 Dec 2012 13:15:14 +0100

Author: wachs
Date: 2012-12-17 13:15:14 +0100 (Mon, 17 Dec 2012)
New Revision: 25506

Modified:
   gnunet/src/sysmon/Makefile.am
Log:
glib check


Modified: gnunet/src/sysmon/Makefile.am
===================================================================
--- gnunet/src/sysmon/Makefile.am       2012-12-17 12:14:44 UTC (rev 25505)
+++ gnunet/src/sysmon/Makefile.am       2012-12-17 12:15:14 UTC (rev 25506)
@@ -1,9 +1,17 @@
-INCLUDES = -I$(top_srcdir)/src/include -I/usr/include/glib-2.0 -I/usr/include 
-I/usr/lib/x86_64-linux-gnu/glib-2.0/include/ -I/usr/include/libgtop-2.0/
+INCLUDES = -I$(top_srcdir)/src/include -I/usr/include/libgtop-2.0/
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
 libexecdir= $(pkglibdir)/libexec/
 
+if HAVE_GLIB2
+  GN_LIBTOP = -lgtop-2.0
+  GN_SYSMON = gnunet_service_sysmon
+  GN_SYSMON_TEST_INIT = test_glibtop
+  GN_SYSMON_TEST_PROCESS = test_glibtop_process
+  GN_SYSMON_TEST_NETWORK = test_glibtop_network 
+endif
+
 pkgcfg_DATA = \
   sysmon.conf
 
@@ -16,18 +24,21 @@
 endif
 
 libexec_PROGRAMS = \
- gnunet_service_sysmon
+ $(GN_SYSMON)
 
 check_PROGRAMS = \
- test_glibtop \
- test_glibtop_process \
- test_glibtop_network
+ $(GN_SYSMON_TEST_INIT) \
+ $(GN_SYSMON_TEST_PROCESS) \
+ $(GN_SYSMON_TEST_NETWORK)
+
+if HAVE_GLIB2
  
 gnunet_service_sysmon_SOURCES = \
  gnunet-service-sysmon.c         
 gnunet_service_sysmon_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(GN_LIBTOP) \
   $(GN_LIBINTL)
 
 test_glibtop_SOURCES = \
@@ -35,7 +46,7 @@
 test_glibtop_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  -lgtop-2.0 \
+  $(GN_LIBTOP) \
   $(GN_LIBINTL)
 
 test_glibtop_process_SOURCES = \
@@ -43,7 +54,7 @@
 test_glibtop_process_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  -lgtop-2.0 \
+  $(GN_LIBTOP) \
   $(GN_LIBINTL)
 
 test_glibtop_network_SOURCES = \
@@ -51,8 +62,9 @@
 test_glibtop_network_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-  -lgtop-2.0 \
+  $(GN_LIBTOP) \
   $(GN_LIBINTL)
+endif
 
 
 if ENABLE_TEST_RUN




reply via email to

[Prev in Thread] Current Thread [Next in Thread]