From 7763ce3c9b7f941918b23060f5454fef5d1de6e7 Mon Sep 17 00:00:00 2001 From: Will Date: Sat, 16 Nov 2013 12:06:29 +0900 Subject: [PATCH] correct dependency order for parallel builds --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index d760004..b05982c 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ SRC := wrk.c net.c ssl.c aprintf.c stats.c script.c units.c \ BIN := wrk ODIR := obj -OBJ := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) +OBJ := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o LDIR = deps/luajit/src LIBS := -lluajit $(LIBS) @@ -34,13 +34,13 @@ clean: $(RM) $(BIN) obj/* @$(MAKE) -C deps/luajit clean -$(BIN): $(OBJ) $(ODIR)/bytecode.o +$(BIN): $(OBJ) @echo LINK $(BIN) @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) -$(OBJ): config.h Makefile | $(ODIR) +$(OBJ): config.h Makefile $(LDIR)/libluajit.a | $(ODIR) -$(ODIR): $(LDIR)/libluajit.a +$(ODIR): @mkdir -p $@ $(ODIR)/bytecode.o: scripts/wrk.lua @@ -52,7 +52,7 @@ $(ODIR)/%.o : %.c @$(CC) $(CFLAGS) -c -o $@ $< $(LDIR)/libluajit.a: - @echo Building LuaJit... + @echo Building LuaJIT... @$(MAKE) -C $(LDIR) BUILDMODE=static .PHONY: all clean