From ac4f6ab93bcb7ab0f7879e7c2bd6175f5f830960 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 13 Sep 2018 16:29:49 +0200 Subject: [PATCH] test: improve Makefile The -s option of make apparently doesn't work when called from make -C. Add another filter to ignore the Entering/Leaving messages. Also, fix a typo. --- test/unit/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/Makefile.in b/test/unit/Makefile.in index 333365a..72c595e 100644 --- a/test/unit/Makefile.in +++ b/test/unit/Makefile.in @@ -12,11 +12,11 @@ TEST_OBJS := $(sort $(patsubst %.c,%.o,$(wildcard *.c))) TESTS := $(patsubst %.o,%.test,$(filter-out $(SHARED_OBJS),$(TEST_OBJS))) CHRONYD_OBJS := $(patsubst %.o,$(CHRONY_SRCDIR)/%.o,$(filter-out main.o,\ - $(shell $(MAKE) -s -C $(CHRONY_SRCDIR) print-chronyd-objects))) + $(filter %.o,$(shell $(MAKE) -s -C $(CHRONY_SRCDIR) print-chronyd-objects)))) all: $(TESTS) -$(CHRONY_OBJS): ; +$(CHRONYD_OBJS): ; %.test: %.o $(SHARED_OBJS) $(CHRONYD_OBJS) $(CC) $(CFLAGS) -o $@ $(filter-out $(CHRONY_SRCDIR)/$<,$^) $(LDFLAGS)