tools/Makefile: add WITH_SYSTEMD CFLAGS

Introduce EXTRA_CFLAGS, "-DWITH_SYSTEMD" that will get passed to tools
and depending upon the configure options, enable and disable the systemd
support.

Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>

diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 60e69690d652f0b91c5ee13f1dadfc5a44290cbd..f6df32f8016a1fa70c651b95da00e9a9a8f1836a 100644 (file)
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -5,6 +5,10 @@ LDADD = $(top_builddir)/src/libcgroup.la -lpthread
 
 if WITH_TOOLS
 
+if WITH_SYSTEMD
+EXTRA_CFLAGS = -DWITH_SYSTEMD
+endif
+
 bin_PROGRAMS = cgexec cgclassify cgcreate cgset cgxset cgget cgxget cgdelete \
               lssubsys lscgroup cgsnapshot
 
@@ -14,44 +18,44 @@ noinst_LTLIBRARIES = libcgset.la
 
 cgexec_SOURCES = cgexec.c tools-common.c tools-common.h
 cgexec_LIBS = $(CODE_COVERAGE_LIBS)
-cgexec_CFLAGS = $(CODE_COVERAGE_CFLAGS)
+cgexec_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(EXTRA_CFLAGS)
 
 cgclassify_SOURCES = cgclassify.c tools-common.c tools-common.h
 cgclassify_LIBS = $(CODE_COVERAGE_LIBS)
-cgclassify_CFLAGS = $(CODE_COVERAGE_CFLAGS)
+cgclassify_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(EXTRA_CFLAGS)
 
 cgcreate_SOURCES = cgcreate.c tools-common.c tools-common.h
 cgcreate_LIBS = $(CODE_COVERAGE_LIBS)
-cgcreate_CFLAGS = $(CODE_COVERAGE_CFLAGS)
+cgcreate_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(EXTRA_CFLAGS)
 
 libcgset_la_SOURCES = cgset.c tools-common.c tools-common.h
 libcgset_la_LIBADD = $(CODE_COVERAGE_LIBS)
-libcgset_la_CFLAGS = $(CODE_COVERAGE_CFLAGS) -DSTATIC= -DUNIT_TEST
+libcgset_la_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(EXTRA_CFLAGS) -DSTATIC= -DUNIT_TEST
 libcgset_la_LDFLAGS = -Wl,--no-undefined $(LDADD)
 
 cgset_SOURCES = cgset.c tools-common.c tools-common.h
 cgset_LIBS = $(CODE_COVERAGE_LIBS)
-cgset_CFLAGS = $(CODE_COVERAGE_CFLAGS) -DSTATIC=static
+cgset_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(EXTRA_CFLAGS) -DSTATIC=static
 
 cgxset_SOURCES = cgxset.c tools-common.c tools-common.h
 cgxset_LIBS = $(CODE_COVERAGE_LIBS)
-cgxset_CFLAGS = $(CODE_COVERAGE_CFLAGS) -DSTATIC=static
+cgxset_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(EXTRA_CFLAGS) -DSTATIC=static
 
 cgget_SOURCES = cgget.c tools-common.c tools-common.h
 cgget_LIBS = $(CODE_COVERAGE_LIBS)
-cgget_CFLAGS = $(CODE_COVERAGE_CFLAGS)
+cgget_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(EXTRA_CFLAGS)
 
 cgxget_SOURCES = cgxget.c tools-common.c tools-common.h
 cgxget_LIBS = $(CODE_COVERAGE_LIBS)
-cgxget_CFLAGS = $(CODE_COVERAGE_CFLAGS)
+cgxget_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(EXTRA_CFLAGS)
 
 cgconfigparser_SOURCES = cgconfig.c tools-common.c tools-common.h
 cgconfigparser_LIBS = $(CODE_COVERAGE_LIBS)
-cgconfigparser_CFLAGS = $(CODE_COVERAGE_CFLAGS)
+cgconfigparser_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(EXTRA_CFLAGS)
 
 cgdelete_SOURCES = cgdelete.c tools-common.c tools-common.h
 cgdelete_LIBS = $(CODE_COVERAGE_LIBS)
-cgdelete_CFLAGS = $(CODE_COVERAGE_CFLAGS)
+cgdelete_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(EXTRA_CFLAGS)
 
 lssubsys_SOURCES = lssubsys.c
 lssubsys_LIBS = $(CODE_COVERAGE_LIBS)
@@ -59,11 +63,11 @@ lssubsys_CFLAGS = $(CODE_COVERAGE_CFLAGS)
 
 lscgroup_SOURCES = tools-common.c lscgroup.c
 lscgroup_LIBS = $(CODE_COVERAGE_LIBS)
-lscgroup_CFLAGS = $(CODE_COVERAGE_CFLAGS)
+lscgroup_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(EXTRA_CFLAGS)
 
 cgsnapshot_SOURCES = cgsnapshot.c
 cgsnapshot_LIBS = $(CODE_COVERAGE_LIBS)
-cgsnapshot_CFLAGS = $(CODE_COVERAGE_CFLAGS)
+cgsnapshot_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(EXTRA_CFLAGS)
 
 install-exec-hook:
        chmod u+s $(DESTDIR)$(bindir)/cgexec