Fix build/installation so we don't install the libraries directly to $(libdir) anymore, and thus can do testing out of a build tree (ish).
diff --git a/testcases/kernel/containers/Makefile.inc b/testcases/kernel/containers/Makefile.inc
index ad424ea..ac38456 100644
--- a/testcases/kernel/containers/Makefile.inc
+++ b/testcases/kernel/containers/Makefile.inc
@@ -22,22 +22,21 @@
# DO NOT USE THIS FILE FOR containers / libclone!!!
-LIBS := $(DESTDIR)/$(libdir)/libclone.a
+LIBDIR := ../libclone
-LIBDIR := libclone
+LIBS := $(LIBDIR)/libclone.a
-CPPFLAGS += -I$(abs_srcdir)/../$(LIBDIR)
+CPPFLAGS += -I$(abs_srcdir)/$(LIBDIR)
+
+LDFLAGS += -L$(abs_builddir)/$(LIBDIR)
../$(LIBDIR):
mkdir -p "$@"
# Make the target the real lib so we don't have to deal with rebuilding this
# every time the dependency is evaluated, like with PHONY rules.
-$(LIBS): ../$(LIBDIR)
- for i in all install; do \
- $(MAKE) -C $^ -f "$(abs_srcdir)/$^/Makefile" \
- $$i; \
- done
+$(LIBS): $(LIBDIR)
+ $(MAKE) -C $^ -f "$(abs_srcdir)/$^/Makefile" all
INSTALL_TARGETS ?= *.sh
diff --git a/testcases/kernel/controllers/Makefile.inc b/testcases/kernel/controllers/Makefile.inc
index 728c8f5..803059f 100644
--- a/testcases/kernel/controllers/Makefile.inc
+++ b/testcases/kernel/controllers/Makefile.inc
@@ -37,6 +37,8 @@
CPPFLAGS += -I$(abs_srcdir)/../$(LIBDIR)
+LDFLAGS += -L$(abs_builddir)/../$(LIBDIR)
+
LDLIBS += -lcontrollers
INSTALL_TARGETS ?= *.sh
diff --git a/testcases/kernel/controllers/cpuset/Makefile.inc b/testcases/kernel/controllers/cpuset/Makefile.inc
index 3921352..4b41abe 100644
--- a/testcases/kernel/controllers/cpuset/Makefile.inc
+++ b/testcases/kernel/controllers/cpuset/Makefile.inc
@@ -20,19 +20,20 @@
# Garrett Cooper, July 2009
#
-LIB := $(DESTDIR)/$(libdir)/libcpu_set.a
-LIBDIR := cpuset_lib
+LIBDIR := ../cpuset_lib
-../$(LIBDIR):
+LIB := $(LIBDIR)/libcpu_set.a
+
+$(LIBDIR):
mkdir -p "$@"
-$(LIB): ../$(LIBDIR)
- for i in all install; do \
- $(MAKE) -C $^ -f "$(abs_srcdir)/$^/Makefile" $$i; \
- done
+$(LIB): $(LIBDIR)
+ $(MAKE) -C $^ -f "$(abs_srcdir)/$^/Makefile" all
all: | $(LIB)
+LDFLAGS += -L$(abs_builddir)/$(LIBDIR)
+
LDLIBS += -lcpu_set
INSTALL_TARGETS ?= *.sh
diff --git a/testcases/kernel/mem/Makefile.inc b/testcases/kernel/mem/Makefile.inc
index a5a922a..3d8faf6 100644
--- a/testcases/kernel/mem/Makefile.inc
+++ b/testcases/kernel/mem/Makefile.inc
@@ -23,16 +23,14 @@
# DO NOT USE THIS FILE FOR mem / libmm!!!
LDLIBS += -lmm
-LIB := $(DESTDIR)/$(libdir)/libmm.a
-LIBDIR := libmm
+LIBDIR := ../libmm
+LIB := $(LIBDIR)/libmm.a
-../$(LIBDIR):
+$(LIBDIR):
mkdir -p "$@"
-$(LIB): ../$(LIBDIR)
- for i in all install; do \
- $(MAKE) -C $^ -f "$(abs_srcdir)/$^/Makefile" $$i; \
- done
+$(LIB): $(LIBDIR)
+ $(MAKE) -C $^ -f "$(abs_srcdir)/$^/Makefile" all
all: | $(LIB)
diff --git a/testcases/kernel/mem/hugetlb/Makefile.inc b/testcases/kernel/mem/hugetlb/Makefile.inc
index eb76fac..73d4788 100644
--- a/testcases/kernel/mem/hugetlb/Makefile.inc
+++ b/testcases/kernel/mem/hugetlb/Makefile.inc
@@ -21,19 +21,18 @@
#
# DO NOT USE THIS FILE FOR hugetlb / lib!!!
+LIBDIR := ../lib
+LIB := $(LIBDIR)/libipc_hugetlb.a
-CPPFLAGS += -I$(abs_srcdir)/../lib
-LIB := $(DESTDIR)/$(libdir)/libipc_hugetlb.a
-LIBDIR := lib
-
-../$(LIBDIR):
+$(LIBDIR):
mkdir -p "$@"
-$(LIB): ../$(LIBDIR)
- for i in all install; do \
- $(MAKE) -I "$(abs_srcdir)" -C "$^" -f "$(abs_srcdir)/$^/Makefile" \
- $$i; \
- done
+$(LIB): $(LIBDIR)
+ $(MAKE) -C "$^" -f "$(abs_srcdir)/$^/Makefile" all
+
+CPPFLAGS += -I$(abs_srcdir)/$(LIBDIR)
+
+LDFLAGS += -L$(abs_builddir)/$(LIBDIR)
LDLIBS += -lmm -lipc_hugetlb
diff --git a/testcases/kernel/syscalls/ipc/Makefile.inc b/testcases/kernel/syscalls/ipc/Makefile.inc
index 4918833..43c303a 100644
--- a/testcases/kernel/syscalls/ipc/Makefile.inc
+++ b/testcases/kernel/syscalls/ipc/Makefile.inc
@@ -22,19 +22,21 @@
# DO NOT USE THIS FILE FOR ipc / lib!!!
-CPPFLAGS += -I$(abs_srcdir)/../lib
LDLIBS += -lipc
-LIB := $(DESTDIR)/$(libdir)/libipc.a
-LIBDIR := lib
+LIBDIR := ../lib
-../$(LIBDIR):
+LIB := $(LIBDIR)/libipc.a
+
+$(LIBDIR):
mkdir -p "$@"
-$(LIB): ../$(LIBDIR)
- for i in all install; do \
- $(MAKE) -C $^ -f "$(abs_srcdir)/$^/Makefile" $$i; \
- done
+$(LIB): $(LIBDIR)
+ $(MAKE) -C $^ -f "$(abs_srcdir)/$^/Makefile" all
all: | $(LIB)
+CPPFLAGS += -I$(abs_srcdir)/$(LIBDIR)
+
+LDFLAGS += -L$(abs_builddir)/$(LIBDIR)
+
# vim: syntax=make