From ccf9ad6d879cec4ca7a9620ebe28a53b4568b5d4 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Mon, 14 Dec 2009 09:22:36 +0100 Subject: [PATCH] Fix compilation outside of source directory Configure script can be invoked outside of source directory, which allows to compile sources without spoiling the source directory with compilation artifacts (like .o files). This patch tries to fix our Makefiles to allow this to work. You can test it in current GIT checkout (in the root dir): # mkdir build; cd build; ../configure; make As result, you should see all binary files in the 'build' directory. Signed-off-by: Jan Safranek Signed-off-by: Dhaval Giani --- src/Makefile.am | 2 +- src/daemon/Makefile.am | 4 ++-- src/pam/Makefile.am | 2 +- src/tools/Makefile.am | 2 +- tests/Makefile.am | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index f4106ba4..652a23f0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,6 +7,6 @@ INCLUDES = -I$(top_srcdir)/include lib_LTLIBRARIES = libcgroup.la libcgroup_la_SOURCES = parse.y lex.l api.c config.c libcgroup-internal.h libcgroup.map wrapper.c libcgroup_la_LIBADD = -lpthread -libcgroup_la_LDFLAGS = -Wl,--version-script,libcgroup.map \ +libcgroup_la_LDFLAGS = -Wl,--version-script,$(srcdir)/libcgroup.map \ -version-number $(LIBRARY_VERSION_MAJOR):$(LIBRARY_VERSION_MINOR):$(LIBRARY_VERSION_RELEASE) diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index feeeb3a7..f3100ede 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -4,7 +4,7 @@ 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 +cgrulesengd_LDADD = $(top_builddir)/src/.libs/libcgroup.la -lrt +cgrulesengd_LDFLAGS = -L$(top_builddir)/src/.libs endif diff --git a/src/pam/Makefile.am b/src/pam/Makefile.am index 2ad565ee..841f85a1 100644 --- a/src/pam/Makefile.am +++ b/src/pam/Makefile.am @@ -5,6 +5,6 @@ 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 +pam_cgroup_la_LIBADD = $(top_builddir)/src/.libs/libcgroup.la -lpam endif diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index d5414456..ccfeeaea 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include -LDADD = $(top_srcdir)/src/.libs/libcgroup.la +LDADD = $(top_builddir)/src/.libs/libcgroup.la if WITH_TOOLS diff --git a/tests/Makefile.am b/tests/Makefile.am index 11612926..b88688b3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = -I$(top_srcdir)/include -LDADD = $(top_srcdir)/src/.libs/libcgroup.la +LDADD = $(top_builddir)/src/.libs/libcgroup.la # compile the tests, but do not install them noinst_PROGRAMS = libcgrouptest01 libcg_ba setuid pathtest walk_test read_stats walk_task get_controller get_mount_point proctest get_all_controller -- 2.47.2