Modification of makefiles. cgrulesengd.c uses new functions for loading
files from /etc/cgconfig.d/. Thus there is a dependency on
tools-common.[c|h] files. Unfortunatelly they are in ../tools directory,
adding dependency on files in a diffrent directory but on the same
level. Makefile.in is regenerated from Makefile.am using autoreconf -ivf.
This patch depends on [PATCH 2/4]
Tested on my local machine, all files are loaded properly, cgrulesengd
properly creates groups based on templates from files from
/etc/cgconfig.d/.
Signed-off-by: Jan Chaloupka<jchal...@redhat.com>
---
src/daemon/Makefile.am | 4 ++--
src/daemon/Makefile.in | 25 +++++++++++++++++++++----
2 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index f3100ed..abbbe30 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -1,9 +1,9 @@
-INCLUDES = -I $(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include
if WITH_DAEMON
sbin_PROGRAMS = cgrulesengd
-cgrulesengd_SOURCES = cgrulesengd.c cgrulesengd.h
+cgrulesengd_SOURCES = cgrulesengd.c cgrulesengd.h
../tools/tools-common.h ../tools/tools-common.c
cgrulesengd_LDADD = $(top_builddir)/src/.libs/libcgroup.la -lrt
cgrulesengd_LDFLAGS = -L$(top_builddir)/src/.libs
diff --git a/src/daemon/Makefile.in b/src/daemon/Makefile.in
index 76f7e07..f3efc65 100644
--- a/src/daemon/Makefile.in
+++ b/src/daemon/Makefile.in
@@ -92,8 +92,10 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(sbindir)"
PROGRAMS = $(sbin_PROGRAMS)
-am__cgrulesengd_SOURCES_DIST = cgrulesengd.c cgrulesengd.h
-@WITH_DAEMON_TRUE@am_cgrulesengd_OBJECTS = cgrulesengd.$(OBJEXT)
+am__cgrulesengd_SOURCES_DIST = cgrulesengd.c cgrulesengd.h \
+ ../tools/tools-common.h ../tools/tools-common.c
+@WITH_DAEMON_TRUE@am_cgrulesengd_OBJECTS = cgrulesengd.$(OBJEXT) \
+@WITH_DAEMON_TRUE@ tools-common.$(OBJEXT)
cgrulesengd_OBJECTS = $(am_cgrulesengd_OBJECTS)
@WITH_DAEMON_TRUE@cgrulesengd_DEPENDENCIES = \
@WITH_DAEMON_TRUE@ $(top_builddir)/src/.libs/libcgroup.la
@@ -294,8 +296,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = -I $(top_srcdir)/include
-@WITH_DAEMON_TRUE@cgrulesengd_SOURCES = cgrulesengd.c cgrulesengd.h
+INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include
+@WITH_DAEMON_TRUE@cgrulesengd_SOURCES = cgrulesengd.c cgrulesengd.h
../tools/tools-common.h ../tools/tools-common.c
@WITH_DAEMON_TRUE@cgrulesengd_LDADD =
$(top_builddir)/src/.libs/libcgroup.la -lrt
@WITH_DAEMON_TRUE@cgrulesengd_LDFLAGS = -L$(top_builddir)/src/.libs
all: all-am
@@ -393,6 +395,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cgrulesengd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tools-common.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF
$(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -415,6 +418,20 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+tools-common.o: ../tools/tools-common.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
tools-common.o -MD -MP -MF $(DEPDIR)/tools-common.Tpo -c -o
tools-common.o `test -f '../tools/tools-common.c' || echo
'$(srcdir)/'`../tools/tools-common.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tools-common.Tpo
$(DEPDIR)/tools-common.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@
$(AM_V_CC)source='../tools/tools-common.c' object='tools-common.o'
libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
$(CFLAGS) -c -o tools-common.o `test -f '../tools/tools-common.c' ||
echo '$(srcdir)/'`../tools/tools-common.c
+
+tools-common.obj: ../tools/tools-common.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
tools-common.obj -MD -MP -MF $(DEPDIR)/tools-common.Tpo -c -o
tools-common.obj `if test -f '../tools/tools-common.c'; then
$(CYGPATH_W) '../tools/tools-common.c'; else $(CYGPATH_W)
'$(srcdir)/../tools/tools-common.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tools-common.Tpo
$(DEPDIR)/tools-common.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@
$(AM_V_CC)source='../tools/tools-common.c' object='tools-common.obj'
libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
$(CFLAGS) -c -o tools-common.obj `if test -f '../tools/tools-common.c';
then $(CYGPATH_W) '../tools/tools-common.c'; else $(CYGPATH_W)
'$(srcdir)/../tools/tools-common.c'; fi`
+
mostlyclean-libtool:
-rm -f *.lo
--
1.9.0
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
Libcg-devel mailing list
Libcg-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/libcg-devel
