diff options
| author | Dhaval Giani <dhaval@linux.vnet.ibm.com> | 2009-05-29 15:44:57 +0530 |
|---|---|---|
| committer | Dhaval Giani <dhaval@linux.vnet.ibm.com> | 2009-05-29 15:44:57 +0530 |
| commit | 301eb37677429a26b47eee2cab25140b24b561c2 (patch) | |
| tree | 79e689cf1bda29906672cfe48c37c16e85306c7a /src | |
| parent | 8315b5b9fb612d995d843361dbc58b3dd99bf1b2 (diff) | |
| parent | 052073bbb6b90eba8822e8105ed4250fa1e2d72b (diff) | |
| download | libcg-301eb37677429a26b47eee2cab25140b24b561c2.tar.gz libcg-301eb37677429a26b47eee2cab25140b24b561c2.tar.xz libcg-301eb37677429a26b47eee2cab25140b24b561c2.zip | |
Merge branch 'devel/automake-updates' of git://fedorapeople.org/~jsafrane/libcg
Diffstat (limited to 'src')
| -rw-r--r-- | src/daemon/Makefile.am | 6 | ||||
| -rw-r--r-- | src/pam/Makefile.am | 6 | ||||
| -rw-r--r-- | src/tools/Makefile.am | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index f0c9b92..feeeb3a 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -1,6 +1,10 @@ INCLUDES = -I $(top_srcdir)/include -sbin_PROGRAMS = cgrulesengd +if WITH_DAEMON + +sbin_PROGRAMS = cgrulesengd cgrulesengd_SOURCES = cgrulesengd.c cgrulesengd.h cgrulesengd_LDADD = $(top_srcdir)/src/.libs/libcgroup.la -lrt cgrulesengd_LDFLAGS = -L$(top_srcdir)/src/.libs + +endif diff --git a/src/pam/Makefile.am b/src/pam/Makefile.am index 1a1e782..2ad565e 100644 --- a/src/pam/Makefile.am +++ b/src/pam/Makefile.am @@ -1,6 +1,10 @@ INCLUDES = -I $(top_srcdir)/include -lib_LTLIBRARIES = pam_cgroup.la +if WITH_PAM + +lib_LTLIBRARIES = pam_cgroup.la pam_cgroup_la_SOURCES = pam_cgroup.c pam_cgroup_la_LDFLAGS = -module pam_cgroup_la_LIBADD = $(top_srcdir)/src/.libs/libcgroup.la -lpam + +endif diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index e1cace3..93d09ac 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -1,7 +1,10 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include LDADD = $(top_srcdir)/src/.libs/libcgroup.la +if WITH_TOOLS + bin_PROGRAMS = cgexec cgclassify + sbin_PROGRAMS = cgconfigparser cgexec_SOURCES = cgexec.c tools-common.c tools-common.h @@ -10,3 +13,4 @@ cgclassify_SOURCES = cgclassify.c tools-common.c tools-common.h cgconfigparser_SOURCES = cgconfig.c +endif |