diff --git a/include/mk/lib.mk b/include/mk/lib.mk index 96c08eb..456db24 100644 --- a/include/mk/lib.mk +++ b/include/mk/lib.mk @@ -46,7 +46,7 @@ ifneq ($(MAKECMDGOALS),install) LIB ?= $(INTERNAL_LIB) endif -MAKE_TARGETS := $(LIB) +MAKE_TARGETS += $(LIB) LIBSRCS ?= $(wildcard $(abs_srcdir)/*.c) diff --git a/testcases/kernel/syscalls/ipc/Makefile.inc b/testcases/kernel/syscalls/ipc/Makefile.inc index a468e93..c7890a9 100644 --- a/testcases/kernel/syscalls/ipc/Makefile.inc +++ b/testcases/kernel/syscalls/ipc/Makefile.inc @@ -25,15 +25,15 @@ LDLIBS += -lipc LIBDIR := ../lib -LIB := $(LIBDIR)/libipc.a +LIBIPC := $(LIBDIR)/libipc.a $(LIBDIR): mkdir -p "$@" -$(LIB): $(LIBDIR) +$(LIBIPC): $(LIBDIR) $(MAKE) -C $^ -f "$(abs_srcdir)/$^/Makefile" all -MAKE_DEPS := $(LIB) +MAKE_DEPS := $(LIBIPC) CPPFLAGS += -I$(abs_srcdir)/$(LIBDIR) diff --git a/testcases/kernel/syscalls/ipc/msgctl/Makefile b/testcases/kernel/syscalls/ipc/msgctl/Makefile index f467389..7f1688b 100644 --- a/testcases/kernel/syscalls/ipc/msgctl/Makefile +++ b/testcases/kernel/syscalls/ipc/msgctl/Makefile @@ -17,7 +17,17 @@ # top_srcdir ?= ../../../../.. - include $(top_srcdir)/include/mk/testcases.mk + +LIBSRCS := libmsgctl.c +INTERNAL_LIB := libmsgctl.a +MAKE_TARGETS := $(patsubst %.c,%,$(wildcard msgctl??.c)) + +$(MAKE_TARGETS): $(INTERNAL_LIB) + +LDFLAGS += -L$(abs_builddir) +LDLIBS += -lmsgctl + include $(abs_srcdir)/../Makefile.inc +include $(top_srcdir)/include/mk/lib.mk include $(top_srcdir)/include/mk/generic_leaf_target.mk