woj/nsjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makefile: deal with .proto better

Browse Source
This commit is contained in:
Robert Swiecki 2017-09-16 00:31:53 +02:00
parent 23bb48c9de
commit 5c2d98562c
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@ -35,9 +35,9 @@ BIN = nsjail
LIBS = kafel/libkafel.a LIBS = kafel/libkafel.a
SRCS_C = nsjail.c caps.c cmdline.c contain.c log.c cgroup.c mount.c net.c pid.c sandbox.c subproc.c user.c util.c uts.c cpu.c SRCS_C = nsjail.c caps.c cmdline.c contain.c log.c cgroup.c mount.c net.c pid.c sandbox.c subproc.c user.c util.c uts.c cpu.c
SRCS_CXX = config.cc SRCS_CXX = config.cc
SRCS_PB = config.proto SRCS_PROTO = config.proto
OBJS = $(SRCS_C:.c=.o) $(SRCS_CXX:.cc=.o) $(SRCS_PB:.proto=.pb.o) SRCS_PB = $(SRCS_PROTO:.proto=.pb.cc)
PROTO_DEPS = config.pb.cc config.pb.h OBJS = $(SRCS_C:.c=.o) $(SRCS_CXX:.cc=.o) $(SRCS_PB:.cc=.o)
ifdef DEBUG ifdef DEBUG
CFLAGS += -g -ggdb -gdwarf-4 CFLAGS += -g -ggdb -gdwarf-4
@ -61,7 +61,7 @@ endif
.cc.o: %.cc .cc.o: %.cc
$(CXX) $(CXXFLAGS) $< -o $@ $(CXX) $(CXXFLAGS) $< -o $@
all: $(PROTO_DEPS) $(BIN) all: $(BIN)
$(BIN): $(LIBS) $(OBJS) $(BIN): $(LIBS) $(OBJS)
$(CXX) -o $(BIN) $(OBJS) $(LIBS) $(LDFLAGS) $(CXX) -o $(BIN) $(OBJS) $(LIBS) $(LDFLAGS)
@ -72,17 +72,17 @@ ifeq ("$(wildcard kafel/Makefile)","")
endif endif
$(MAKE) -C kafel $(MAKE) -C kafel
$(PROTO_DEPS): $(SRCS_PB) $(SRCS_PB): $(SRCS_PROTO)
protoc --cpp_out=. $(SRCS_PB) protoc --cpp_out=. $(SRCS_PROTO)
clean: clean:
$(RM) core Makefile.bak $(OBJS) $(BIN) $(PROTO_DEPS) $(RM) core Makefile.bak $(OBJS) $(SRCS_PB) $(BIN)
ifneq ("$(wildcard kafel/Makefile)","") ifneq ("$(wildcard kafel/Makefile)","")
$(MAKE) -C kafel clean $(MAKE) -C kafel clean
endif endif
depend: depend:
makedepend -Y -Ykafel/include -- -- $(SRCS_C) $(SRCS_CXX) makedepend -Y -Ykafel/include -- -- $(SRCS_C) $(SRCS_CXX) $(SRCS_PB)
indent: indent:
clang-format --style=WebKit -i -sort-includes *.c *.h $(SRCS_CXX) clang-format --style=WebKit -i -sort-includes *.c *.h $(SRCS_CXX)
@ -107,4 +107,5 @@ user.o: user.h common.h log.h subproc.h util.h
util.o: util.h common.h log.h util.o: util.h common.h log.h
uts.o: uts.h common.h log.h uts.o: uts.h common.h log.h
cpu.o: cpu.h common.h log.h util.h cpu.o: cpu.h common.h log.h util.h
config.o: common.h caps.h config.h log.h mount.h user.h util.h config.o: common.h caps.h config.h log.h mount.h user.h util.h config.pb.h
config.pb.o: config.pb.h