diff options
| author | Dhaval Giani <dhaval@linux.vnet.ibm.com> | 2008-08-13 19:35:01 +0000 |
|---|---|---|
| committer | Dhaval Giani <dhaval@linux.vnet.ibm.com> | 2008-08-13 19:35:01 +0000 |
| commit | 5d3c683a3f4160cb4d081a3ddcf367311ddf0c8b (patch) | |
| tree | fcb3bc308190d622eb1559714b82d8372e38a5e5 /Makefile | |
| parent | 5c16f4a02dfee006b7fb8a04162ed511e3abc481 (diff) | |
| download | libcg-5d3c683a3f4160cb4d081a3ddcf367311ddf0c8b.tar.gz libcg-5d3c683a3f4160cb4d081a3ddcf367311ddf0c8b.tar.xz libcg-5d3c683a3f4160cb4d081a3ddcf367311ddf0c8b.zip | |
libcgroup: Configuration and parsing updates (v2)
Dhaval, wanted a patch with -p1 generated so that he can apply it and
use it with quilt. Here goes
Testing
Tested with samples/cgconfig.conf (NOTE: expects user balbir to be
present on the system, feel free to change and test).
TODO
1. Add hooks for other controllers, namely memory, cpuacct and cpuset
Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Signed-off-by: Dhaval Giani <dhaval@linux.vnet.ibm.com>
git-svn-id: https://libcg.svn.sourceforge.net/svnroot/libcg/trunk@134 4f4bb910-9a46-0410-90c8-c897d4f1cd53
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 11 insertions, 7 deletions
@@ -14,13 +14,14 @@ YACC_DEBUG=-t DEBUG=-DDEBUG INC=-I. LIBS= -lcgroup -lpthread -LDFLAGS= +LDFLAGS= -L . YACC=byacc LEX=flex bindir=${exec_prefix}/bin +sbindir=${exec_prefix}/sbin libdir=${exec_prefix}/lib includedir=${prefix}/include -prefix=/usr/local +prefix=/usr exec_prefix=${prefix} INSTALL=install INSTALL_DATA=install -m 644 @@ -28,10 +29,11 @@ PACKAGE_VERSION=0.2 CFLAGS=-g -O2 $(INC) -DPACKAGE_VERSION=$(PACKAGE_VERSION) VERSION=1 -all: libcgroup.so +all: libcgroup.so cgconfigparser -cgconfig: libcgroup.so config.c y.tab.c lex.yy.c libcgroup.h file-ops.c - $(CC) $(CFLAGS) -o $@ y.tab.c lex.yy.c config.c file-ops.c $(LDFLAGS) $(LIBS) +cgconfigparser: libcgroup.so config.c y.tab.c lex.yy.c libcgroup.h file-ops.c + $(CC) $(CFLAGS) -o $@ y.tab.c lex.yy.c config.c file-ops.c \ + $(LDFLAGS) $(LIBS) y.tab.c: parse.y lex.yy.c $(YACC) -v -d parse.y @@ -40,7 +42,7 @@ lex.yy.c: lex.l $(LEX) lex.l libcgroup.so: api.c libcgroup.h wrapper.c - $(CC) $(CFLAGS) -shared -fPIC -Wl,--soname,$@.$(VERSION) -o $@ api.c \ + $(CXX) $(CFLAGS) -shared -fPIC -Wl,--soname,$@.$(VERSION) -o $@ api.c \ wrapper.c ln -sf $@ $@.$(VERSION) @@ -52,14 +54,16 @@ install: libcgroup.so $(INSTALL) -D libcgroup.so $(DESTDIR)$(libdir)/libcgroup-$(PACKAGE_VERSION).so ln -sf libcgroup-$(PACKAGE_VERSION).so $(DESTDIR)$(libdir)/libcgroup.so.$(VERSION) ln -sf libcgroup.so.$(VERSION) $(DESTDIR)$(libdir)/libcgroup.so + $(INSTALL) -D cgconfigparser $(DESTDIR)$(sbindir) uninstall: libcgroup.so rm -f $(DESTDIR)$(includedir)/libcgroup.h rm -f $(DESTDIR)$(libdir)/libcgroup.so rm -f $(DESTDIR)$(libdir)/libcgroup.so.$(VERSION) rm -f $(DESTDIR)$(libdir)/libcgroup-$(PACKAGE_VERSION).so + rm -f $(DESTDIR)$(sbindir)/cgconfigparser clean: \rm -f y.tab.c y.tab.h lex.yy.c y.output cgconfig libcgroup.so \ - libcgroup.so.$(VERSION) + libcgroup.so.$(VERSION) cgconfigparser config.log config.status $(MAKE) -C tests clean |