From 87f55d7210e1c2c59981dbca6b3337c4a153ca85 Mon Sep 17 00:00:00 2001 From: Mike Lowis Date: Fri, 6 May 2016 12:46:27 -0400 Subject: [PATCH] moved libshadow.a to object directory and patched up rules to ensure it is built before the commands --- source/shadow/Rules.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/shadow/Rules.mk b/source/shadow/Rules.mk index 92c08d63..26a950a2 100644 --- a/source/shadow/Rules.mk +++ b/source/shadow/Rules.mk @@ -13,7 +13,7 @@ SHADOW_SUBDIR = source/shadow SHADOW_OBJDIR = $(OBJDIR)/shadow # libshadow.a -SHADOW_LIB = $(LIBDIR)/libshadow.a +SHADOW_LIB = $(SHADOW_OBJDIR)/libshadow.a SHADOW_LIB_SRCS = $(wildcard $(SHADOW_SUBDIR)/lib/*.c) SHADOW_LIB_OBJS = $(patsubst $(SHADOW_SUBDIR)/%,$(SHADOW_OBJDIR)/%.o,$(basename $(SHADOW_LIB_SRCS))) @@ -35,7 +35,7 @@ $(SHADOW_LIBMISC): $(SHADOW_LIBMISC_OBJS) $(BINDIR)/%: $(SHADOW_SUBDIR)/src/%.c $(SHADOW_LIBMISC) $(SHADOW_LIB) $(CC) -I$(SHADOW_SUBDIR) -I$(SHADOW_SUBDIR)/libmisc -I$(SHADOW_SUBDIR)/lib -DHAVE_CONFIG_H -O2 -o $@ $^ -$(SHADOW_LIBMISC): $(SHADOW_LIBMISC_OBJS) +$(SHADOW_OBJDIR)/%.a: $(AR) $(ARFLAGS) $@ $^ $(SHADOW_OBJDIR)/%.o: $(SHADOW_SUBDIR)/%.c $(CC) -- 2.54.0