Simplify cloning/building.

Kafel submodule will be automatically initialized if not done manually before invoking `make`.
ArchOJ · May 15, 2017 · dc42815 · dc42815
1 parent f2c8fff
commit dc42815
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,6 +2,6 @@ FROM ubuntu
 
 RUN apt-get update && apt-get install gcc make git bison flex -y
 RUN git clone https://github.com/google/nsjail.git
-RUN cd /nsjail && git submodule update --init && cd kafel && make && cd .. && make
+RUN cd /nsjail && make
 RUN mv /nsjail/nsjail /bin && rm -rf -- /nsjail
 
diff --git a/Makefile b/Makefile
@@ -45,14 +45,21 @@ ifeq ($(USE_NL3), yes)
 endif
 endif
 
+.PHONY: all clear depend indent kafel
+
 .c.o: %.c
 	$(CC) $(CFLAGS) $< -o $@
 
-all: $(BIN)
+all: kafel $(BIN)
 
 $(BIN): $(OBJS) $(LIBS)
 	$(CC) -o $(BIN) $(OBJS) $(LIBS) $(LDFLAGS)
 
+kafel:
+ifeq ("$(wildcard kafel/Makefile)","")
+	git submodule update --init
+endif
+
 kafel/libkafel.a:
 	$(MAKE) -C kafel