Move source to src, better build system

google · May 13, 2017 · cc60cae · cc60cae
1 parent b54cfec
commit cc60cae
Show file tree

Hide file tree

Showing 24 changed files with 153 additions and 126 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,10 +11,10 @@
 *.o
 
 # Generated files
-/lexer.h
-/lexer.c
-/parser.h
-/parser.c
+/src/lexer.h
+/src/lexer.c
+/src/parser.h
+/src/parser.c
 
 # Backup files
 *.bak

diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 #   Kafel - Makefile
 #   -----------------------------------------
 #
-#   Copyright 2016 Google Inc. All Rights Reserved.
+#   Copyright 2017 Google Inc. All Rights Reserved.
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -17,90 +17,9 @@
 #   limitations under the License.
 #
 
-OBJCOPY?=objcopy
+SUBDIRS:=src tools
 
-CFLAGS+=-std=gnu11 -I./include -Wall -Wextra -Werror
-CFLAGS+=-fPIC -fvisibility=hidden
-GENERATED_SRCS:=lexer.c parser.c
-GENERATED:=lexer.h parser.h ${GENERATED_SRCS}
-TEMPORARY:=libkafel_r.o libkafel.o
-SYSCALL_LISTS:=amd64_syscalls.c \
-               arm_syscalls.c
-SRCS:=kafel.c \
-      context.c \
-      codegen.c \
-      expression.c \
-      policy.c \
-      range_rules.c \
-      syscall.c \
-      ${GENERATED_SRCS} \
-      $(SYSCALL_LISTS:%.c=syscalls/%.c)
-GENERATED_OBJECTS:=$(GENERATED_SRCS:.c=.o)
-OBJECTS:=$(SRCS:.c=.o)
-TARGET:=libkafel.so
-STATIC_TARGET:=libkafel.a
-VERSION:=1
+include build/Makefile.mk
 
-ifdef DEBUG
-  CFLAGS += -g -ggdb -gdwarf-4
-else
-  CFLAGS += -O2
-endif
-
-ifdef ASAN
-  CFLAGS += -fsanitize=address
-endif
-
-.PHONY: all clean depend format tools
-
-all: ${TARGET} ${STATIC_TARGET}
-
-tools:
-	$(MAKE) -C tools
-
-# Hard to fix those in generated code so just disable
-${GENERATED_OBJECTS}: CFLAGS+=-Wno-error
-
-clean:
-	$(RM) Makefile.bak ${GENERATED} ${TEMPORARY} ${OBJECTS} ${TARGET} ${STATIC_TARGET}
-	$(MAKE) -C tools clean
-
-${TARGET}: ${OBJECTS}
-	$(CC) -Wl,-soname,${TARGET}.${VERSION} -shared $^ -o $@
-
-${STATIC_TARGET}: ${OBJECTS}
-	$(LD) -r ${OBJECTS} -o libkafel_r.o
-	$(OBJCOPY) --localize-hidden libkafel_r.o libkafel.o
-	$(RM) libkafel_r.o
-	$(AR) rcs $@ libkafel.o
-	$(RM) libkafel.o
-
-lexer.h lexer.c: lexer.l
-	flex $<
-
-parser.h parser.c: parser.y
-	bison $<
-
-depend:
-	makedepend -Y. $(SRCS)
-	$(MAKE) -C tools depend
-
-format:
-	clang-format -i -style=Google *.c *.h syscalls/*.c
-	$(MAKE) -C tools format
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-kafel.o: parser.h context.h policy.h expression.h syscall.h codegen.h
-kafel.o: common.h lexer.h
-context.o: context.h policy.h expression.h syscall.h common.h
-codegen.o: codegen.h context.h policy.h expression.h syscall.h common.h
-codegen.o: range_rules.h
-expression.o: expression.h common.h
-policy.o: policy.h expression.h common.h
-range_rules.o: range_rules.h policy.h expression.h common.h syscall.h
-syscall.o: syscall.h common.h
-lexer.o: parser.h context.h policy.h expression.h syscall.h
-parser.o: parser.h context.h policy.h expression.h syscall.h lexer.h
-syscalls/amd64_syscalls.o: syscall.h
-syscalls/arm_syscalls.o: syscall.h
+all: src
+# DO NOT DELETE
diff --git a/build/Makefile.mk b/build/Makefile.mk
@@ -0,0 +1,63 @@
+#
+#   Kafel - Makefile skeleton
+#   -----------------------------------------
+#
+#   Copyright 2017 Google Inc. All Rights Reserved.
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+PROJECT_ROOT?=
+CFLAGS+=-std=gnu11 -I${PROJECT_ROOT}include -Wall -Wextra -Werror
+
+GENERATED_OBJECTS:=$(GENERATED_SRCS:.c=.o)
+OBJECTS:=$(SRCS:.c=.o)
+
+ifdef DEBUG
+  CFLAGS += -g -ggdb -gdwarf-4
+else
+  CFLAGS += -O2
+endif
+
+ifdef ASAN
+  CFLAGS += -fsanitize=address
+endif
+
+.PHONY: all clean depend format $(SUBDIRS)
+
+all: ${TARGET}
+
+$(SUBDIRS):
+	$(MAKE) -C $@ PROJECT_ROOT=../${PROJECT_ROOT}
+
+clean:
+	$(RM) Makefile.bak ${GENERATED} ${TEMPORARY} ${OBJECTS} ${TARGET} ${STATIC_TARGET}
+	for dir in ${SUBDIRS}; do \
+		$(MAKE) -C $$dir PROJECT_ROOT=../${PROJECT_ROOT} clean; \
+	done
+
+
+depend:
+	makedepend -Y. $(SRCS)
+	for dir in ${SUBDIRS}; do \
+		$(MAKE) -C $$dir PROJECT_ROOT=../${PROJECT_ROOT} depend; \
+	done
+
+format:
+ifdef SRCS
+	clang-format -i -style=Google ${SRCS}
+endif
+	clang-format -i -style=Google *.h || true
+	for dir in ${SUBDIRS}; do \
+		$(MAKE) -C $$dir PROJECT_ROOT=../${PROJECT_ROOT} format; \
+	done
diff --git a/src/Makefile b/src/Makefile
@@ -0,0 +1,77 @@
+#
+#   Kafel - Makefile
+#   -----------------------------------------
+#
+#   Copyright 2016 Google Inc. All Rights Reserved.
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+OBJCOPY?=objcopy
+
+CFLAGS+=-fPIC -fvisibility=hidden
+GENERATED_SRCS:=lexer.c parser.c
+GENERATED:=lexer.h parser.h ${GENERATED_SRCS}
+TEMPORARY:=libkafel_r.o libkafel.o
+SYSCALL_LISTS:=amd64_syscalls.c \
+               arm_syscalls.c
+SRCS:=kafel.c \
+      context.c \
+      codegen.c \
+      expression.c \
+      policy.c \
+      range_rules.c \
+      syscall.c \
+      ${GENERATED_SRCS} \
+      $(SYSCALL_LISTS:%.c=syscalls/%.c)
+DYNAMIC_TARGET:=${PROJECT_ROOT}libkafel.so
+STATIC_TARGET:=${PROJECT_ROOT}libkafel.a
+TARGET=${DYNAMIC_TARGET} ${STATIC_TARGET}
+VERSION:=1
+
+include ${PROJECT_ROOT}build/Makefile.mk
+
+# Hard to fix those in generated code so just disable
+${GENERATED_OBJECTS}: CFLAGS+=-Wno-error
+
+${DYNAMIC_TARGET}: ${OBJECTS}
+	$(CC) -Wl,-soname,$@.${VERSION} -shared $^ -o $@
+
+${STATIC_TARGET}: ${OBJECTS}
+	$(LD) -r ${OBJECTS} -o libkafel_r.o
+	$(OBJCOPY) --localize-hidden libkafel_r.o libkafel.o
+	$(RM) libkafel_r.o
+	$(AR) rcs $@ libkafel.o
+	$(RM) libkafel.o
+
+lexer.h lexer.c: lexer.l
+	flex $<
+
+parser.h parser.c: parser.y
+	bison $<
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+kafel.o: parser.h context.h policy.h expression.h syscall.h codegen.h
+kafel.o: common.h lexer.h
+context.o: context.h policy.h expression.h syscall.h common.h
+codegen.o: codegen.h context.h policy.h expression.h syscall.h common.h
+codegen.o: range_rules.h
+expression.o: expression.h common.h
+policy.o: policy.h expression.h common.h
+range_rules.o: range_rules.h policy.h expression.h common.h syscall.h
+syscall.o: syscall.h common.h
+lexer.o: parser.h context.h policy.h expression.h syscall.h
+parser.o: parser.h context.h policy.h expression.h syscall.h lexer.h
+syscalls/amd64_syscalls.o: syscall.h
+syscalls/arm_syscalls.o: syscall.h
diff --git a/codegen.c → src/codegen.c b/codegen.c → src/codegen.c
diff --git a/codegen.h → src/codegen.h b/codegen.h → src/codegen.h
diff --git a/common.h → src/common.h b/common.h → src/common.h
diff --git a/context.c → src/context.c b/context.c → src/context.c
diff --git a/context.h → src/context.h b/context.h → src/context.h
diff --git a/expression.c → src/expression.c b/expression.c → src/expression.c
diff --git a/expression.h → src/expression.h b/expression.h → src/expression.h
diff --git a/kafel.c → src/kafel.c b/kafel.c → src/kafel.c
diff --git a/lexer.l → src/lexer.l b/lexer.l → src/lexer.l
diff --git a/parser.y → src/parser.y b/parser.y → src/parser.y
diff --git a/policy.c → src/policy.c b/policy.c → src/policy.c
diff --git a/policy.h → src/policy.h b/policy.h → src/policy.h
diff --git a/range_rules.c → src/range_rules.c b/range_rules.c → src/range_rules.c
diff --git a/range_rules.h → src/range_rules.h b/range_rules.h → src/range_rules.h
diff --git a/syscall.c → src/syscall.c b/syscall.c → src/syscall.c
diff --git a/syscall.h → src/syscall.h b/syscall.h → src/syscall.h
diff --git a/syscalls/amd64_syscalls.c → src/syscalls/amd64_syscalls.c b/syscalls/amd64_syscalls.c → src/syscalls/amd64_syscalls.c
diff --git a/syscalls/arm_syscalls.c → src/syscalls/arm_syscalls.c b/syscalls/arm_syscalls.c → src/syscalls/arm_syscalls.c
diff --git a/tools/Makefile b/tools/Makefile
@@ -15,17 +15,7 @@
 
 SUBDIRS:=dump_policy_bpf
 
-.PHONY: all depend format ${SUBDIRS}
+include ${PROJECT_ROOT}build/Makefile.mk
 
 all: ${SUBDIRS}
-${SUBDIRS}:
-	$(MAKE) -C $@
-
-depend:
-	$(MAKE) -C ${SUBDIRS} depend
-
-format:
-	$(MAKE) -C ${SUBDIRS} format
-
-clean:
-	${MAKE} -C ${SUBDIRS} clean
+# DO NOT DELETE
diff --git a/tools/dump_policy_bpf/Makefile b/tools/dump_policy_bpf/Makefile
@@ -17,39 +17,17 @@
 #   limitations under the License.
 #
 
-PROJECT_ROOT:=../../
-CFLAGS+=-std=gnu11 -I${PROJECT_ROOT}include -Wall
 SRCS:=main.c disasm.c
-OBJECTS:=$(SRCS:.c=.o)
 TARGET:=dump_policy_bpf
 LIBS:=${PROJECT_ROOT}libkafel.a
 
-ifdef DEBUG
-        CFLAGS += -g -ggdb -gdwarf-4
-else
-        CFLAGS += -O2
-endif
+include ${PROJECT_ROOT}build/Makefile.mk
 
-ifdef ASAN
-	CFLAGS += -fsanitize=address
-endif
-
-.PHONY: all clean depend format
-
-all: ${TARGET}
-
-clean:
-	$(RM) Makefile.bak ${OBJECTS} ${TARGET}
+CFLAGS+=-Wno-error=type-limits
 
 ${TARGET}: ${OBJECTS}
 	$(CC) ${CFLAGS} $^ ${LIBS} -o $@
 
-depend:
-	makedepend -Y. $(SRCS)
-
-format:
-	clang-format -i -style=Google *.c *.h
-
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 main.o: disasm.h