From: Jan Chaloupka Date: Thu, 19 Jun 2014 09:39:37 +0000 (+0200) Subject: Makefile: update for cgruleseng.d Makefiles X-Git-Tag: v0.42.rc1~49 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21cff76b2b233e9194fbd6608db779c0ac28a135;p=thirdparty%2Flibcgroup.git Makefile: update for cgruleseng.d Makefiles 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. 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 Acked-by: Ivana Hutarova Varekova --- diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index f3100ede..abbbe300 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