diff options
author | Alice Frosi <afrosi@redhat.com> | 2023-03-24 16:08:46 +0100 |
---|---|---|
committer | Alice Frosi <afrosi@redhat.com> | 2023-03-24 16:08:46 +0100 |
commit | e6562db0423e6019154baf05beb02ff3da02f3bb (patch) | |
tree | 07c17ea7d3c193c7cdf6b591422a1e6b7ba22a99 | |
parent | 2e4cab1ff7c9d8db278427d9dca6ccb62619ca18 (diff) | |
download | seitan-e6562db0423e6019154baf05beb02ff3da02f3bb.tar seitan-e6562db0423e6019154baf05beb02ff3da02f3bb.tar.gz seitan-e6562db0423e6019154baf05beb02ff3da02f3bb.tar.bz2 seitan-e6562db0423e6019154baf05beb02ff3da02f3bb.tar.lz seitan-e6562db0423e6019154baf05beb02ff3da02f3bb.tar.xz seitan-e6562db0423e6019154baf05beb02ff3da02f3bb.tar.zst seitan-e6562db0423e6019154baf05beb02ff3da02f3bb.zip |
Re-arrange repository structure
-rw-r--r-- | Makefile | 25 | ||||
-rw-r--r-- | common/common.c (renamed from src/common/common.c) | 0 | ||||
-rw-r--r-- | common/common.h (renamed from src/common/common.h) | 0 | ||||
-rw-r--r-- | common/gluten.h (renamed from src/common/gluten.h) | 0 | ||||
-rw-r--r-- | debug/Makefile (renamed from src/debug/Makefile) | 0 | ||||
-rw-r--r-- | debug/bpf_dbg.c (renamed from src/debug/bpf_dbg.c) | 0 | ||||
-rw-r--r-- | debug/build.c (renamed from src/debug/build.c) | 0 | ||||
-rw-r--r-- | debug/disasm.c (renamed from src/debug/disasm.c) | 0 | ||||
-rw-r--r-- | debug/disasm.h (renamed from src/debug/disasm.h) | 0 | ||||
-rw-r--r-- | operations.c (renamed from src/seitan/operations.c) | 0 | ||||
-rw-r--r-- | operations.h (renamed from src/seitan/operations.h) | 0 | ||||
-rw-r--r-- | seitan-cooker/Makefile (renamed from src/cooker/Makefile) | 0 | ||||
-rw-r--r-- | seitan-cooker/calls.c (renamed from src/cooker/calls.c) | 0 | ||||
-rw-r--r-- | seitan-cooker/calls.h (renamed from src/cooker/calls.h) | 0 | ||||
-rw-r--r-- | seitan-cooker/calls/net.c (renamed from src/cooker/calls/net.c) | 0 | ||||
-rw-r--r-- | seitan-cooker/calls/net.h (renamed from src/cooker/calls/net.h) | 0 | ||||
-rw-r--r-- | seitan-cooker/cooker.h (renamed from src/cooker/cooker.h) | 0 | ||||
-rw-r--r-- | seitan-cooker/emit.c (renamed from src/cooker/emit.c) | 0 | ||||
-rw-r--r-- | seitan-cooker/emit.h (renamed from src/cooker/emit.h) | 0 | ||||
-rw-r--r-- | seitan-cooker/example.hjson (renamed from src/cooker/example.hjson) | 0 | ||||
-rw-r--r-- | seitan-cooker/example.hjson.license (renamed from src/cooker/example.hjson.license) | 0 | ||||
-rw-r--r-- | seitan-cooker/filter.c (renamed from src/cooker/filter.c) | 0 | ||||
-rw-r--r-- | seitan-cooker/filter.h (renamed from src/cooker/filter.h) | 0 | ||||
-rw-r--r-- | seitan-cooker/gluten.c (renamed from src/cooker/gluten.c) | 0 | ||||
-rw-r--r-- | seitan-cooker/gluten.h (renamed from src/cooker/gluten.h) | 0 | ||||
-rw-r--r-- | seitan-cooker/main.c (renamed from src/cooker/main.c) | 0 | ||||
-rw-r--r-- | seitan-cooker/parse.c (renamed from src/cooker/parse.c) | 0 | ||||
-rw-r--r-- | seitan-cooker/parse.h (renamed from src/cooker/parse.h) | 0 | ||||
-rw-r--r-- | seitan-cooker/parson.c (renamed from src/cooker/parson.c) | 0 | ||||
-rw-r--r-- | seitan-cooker/parson.h (renamed from src/cooker/parson.h) | 0 | ||||
-rw-r--r-- | seitan-cooker/util.c (renamed from src/cooker/util.c) | 0 | ||||
-rw-r--r-- | seitan-cooker/util.h (renamed from src/cooker/util.h) | 0 | ||||
-rw-r--r-- | seitan-eater/.Makefile.swp | bin | 0 -> 12288 bytes | |||
-rw-r--r-- | seitan-eater/Makefile (renamed from src/eater/Makefile) | 0 | ||||
-rw-r--r-- | seitan-eater/eater.c (renamed from src/eater/eater.c) | 0 | ||||
-rw-r--r-- | seitan.c (renamed from src/seitan/seitan.c) | 0 | ||||
-rw-r--r-- | src/seitan/Makefile | 35 |
37 files changed, 16 insertions, 44 deletions
@@ -7,28 +7,35 @@ DIR := $(shell pwd) OUTDIR ?= $(DIR)/ - export OUTDIR +COMMON_DIR := $(DIR)/common +BIN := $(OUTDIR)seitan +SRCS := seitan.c $(COMMON_DIR)/common.c operations.c +HEADERS := $(COMMON_DIR)/common.h $(COMMON_DIR)/gluten.h operations.h + +CFLAGS += -DTMP_DATA_SIZE=1000 +CFLAGS += -Wall -Wextra -pedantic -I$(COMMON_DIR) + all: cooker eater seitan cooker: - $(MAKE) -C src/cooker + $(MAKE) -C seitan-cooker eater: - $(MAKE) -C src/eater + $(MAKE) -C seitan-eater seitan: - $(MAKE) -C src/seitan + $(CC) $(CFLAGS) -o $(BIN) $(SRCS) debug: - $(MAKE) -C src/debug + $(MAKE) -C debug clean: - $(MAKE) -C src/cooker clean - $(MAKE) -C src/seitan clean - $(MAKE) -C src/eater clean - $(MAKE) -C src/debug clean + rm -f $(BIN) + $(MAKE) -C cooker clean + $(MAKE) -C eater clean + $(MAKE) -C debug clean numbers.h: ./scripts/nr_syscalls.sh diff --git a/src/common/common.c b/common/common.c index a8f79a2..a8f79a2 100644 --- a/src/common/common.c +++ b/common/common.c diff --git a/src/common/common.h b/common/common.h index 487032b..487032b 100644 --- a/src/common/common.h +++ b/common/common.h diff --git a/src/common/gluten.h b/common/gluten.h index 8370cf5..8370cf5 100644 --- a/src/common/gluten.h +++ b/common/gluten.h diff --git a/src/debug/Makefile b/debug/Makefile index 6ef7900..6ef7900 100644 --- a/src/debug/Makefile +++ b/debug/Makefile diff --git a/src/debug/bpf_dbg.c b/debug/bpf_dbg.c index b84c713..b84c713 100644 --- a/src/debug/bpf_dbg.c +++ b/debug/bpf_dbg.c diff --git a/src/debug/build.c b/debug/build.c index 93ce97b..93ce97b 100644 --- a/src/debug/build.c +++ b/debug/build.c diff --git a/src/debug/disasm.c b/debug/disasm.c index fae96b7..fae96b7 100644 --- a/src/debug/disasm.c +++ b/debug/disasm.c diff --git a/src/debug/disasm.h b/debug/disasm.h index c3e3ad9..c3e3ad9 100644 --- a/src/debug/disasm.h +++ b/debug/disasm.h diff --git a/src/seitan/operations.c b/operations.c index 0327e57..0327e57 100644 --- a/src/seitan/operations.c +++ b/operations.c diff --git a/src/seitan/operations.h b/operations.h index 3691a50..3691a50 100644 --- a/src/seitan/operations.h +++ b/operations.h diff --git a/src/cooker/Makefile b/seitan-cooker/Makefile index 8741879..8741879 100644 --- a/src/cooker/Makefile +++ b/seitan-cooker/Makefile diff --git a/src/cooker/calls.c b/seitan-cooker/calls.c index 74b5a06..74b5a06 100644 --- a/src/cooker/calls.c +++ b/seitan-cooker/calls.c diff --git a/src/cooker/calls.h b/seitan-cooker/calls.h index 5d46e14..5d46e14 100644 --- a/src/cooker/calls.h +++ b/seitan-cooker/calls.h diff --git a/src/cooker/calls/net.c b/seitan-cooker/calls/net.c index c0949cc..c0949cc 100644 --- a/src/cooker/calls/net.c +++ b/seitan-cooker/calls/net.c diff --git a/src/cooker/calls/net.h b/seitan-cooker/calls/net.h index 105bf4a..105bf4a 100644 --- a/src/cooker/calls/net.h +++ b/seitan-cooker/calls/net.h diff --git a/src/cooker/cooker.h b/seitan-cooker/cooker.h index 53aa0db..53aa0db 100644 --- a/src/cooker/cooker.h +++ b/seitan-cooker/cooker.h diff --git a/src/cooker/emit.c b/seitan-cooker/emit.c index a82529c..a82529c 100644 --- a/src/cooker/emit.c +++ b/seitan-cooker/emit.c diff --git a/src/cooker/emit.h b/seitan-cooker/emit.h index 74264b1..74264b1 100644 --- a/src/cooker/emit.h +++ b/seitan-cooker/emit.h diff --git a/src/cooker/example.hjson b/seitan-cooker/example.hjson index 45ed339..45ed339 100644 --- a/src/cooker/example.hjson +++ b/seitan-cooker/example.hjson diff --git a/src/cooker/example.hjson.license b/seitan-cooker/example.hjson.license index 2e3bd69..2e3bd69 100644 --- a/src/cooker/example.hjson.license +++ b/seitan-cooker/example.hjson.license diff --git a/src/cooker/filter.c b/seitan-cooker/filter.c index dbda7ca..dbda7ca 100644 --- a/src/cooker/filter.c +++ b/seitan-cooker/filter.c diff --git a/src/cooker/filter.h b/seitan-cooker/filter.h index ee5ab12..ee5ab12 100644 --- a/src/cooker/filter.h +++ b/seitan-cooker/filter.h diff --git a/src/cooker/gluten.c b/seitan-cooker/gluten.c index 1116e6b..1116e6b 100644 --- a/src/cooker/gluten.c +++ b/seitan-cooker/gluten.c diff --git a/src/cooker/gluten.h b/seitan-cooker/gluten.h index 440029d..440029d 100644 --- a/src/cooker/gluten.h +++ b/seitan-cooker/gluten.h diff --git a/src/cooker/main.c b/seitan-cooker/main.c index 9965cff..9965cff 100644 --- a/src/cooker/main.c +++ b/seitan-cooker/main.c diff --git a/src/cooker/parse.c b/seitan-cooker/parse.c index 9d8a7be..9d8a7be 100644 --- a/src/cooker/parse.c +++ b/seitan-cooker/parse.c diff --git a/src/cooker/parse.h b/seitan-cooker/parse.h index cb4a2f2..cb4a2f2 100644 --- a/src/cooker/parse.h +++ b/seitan-cooker/parse.h diff --git a/src/cooker/parson.c b/seitan-cooker/parson.c index a7a844a..a7a844a 100644 --- a/src/cooker/parson.c +++ b/seitan-cooker/parson.c diff --git a/src/cooker/parson.h b/seitan-cooker/parson.h index 186fcb0..186fcb0 100644 --- a/src/cooker/parson.h +++ b/seitan-cooker/parson.h diff --git a/src/cooker/util.c b/seitan-cooker/util.c index a2ecce0..a2ecce0 100644 --- a/src/cooker/util.c +++ b/seitan-cooker/util.c diff --git a/src/cooker/util.h b/seitan-cooker/util.h index 84dc3db..84dc3db 100644 --- a/src/cooker/util.h +++ b/seitan-cooker/util.h diff --git a/seitan-eater/.Makefile.swp b/seitan-eater/.Makefile.swp Binary files differnew file mode 100644 index 0000000..dbffcaf --- /dev/null +++ b/seitan-eater/.Makefile.swp diff --git a/src/eater/Makefile b/seitan-eater/Makefile index c70433f..c70433f 100644 --- a/src/eater/Makefile +++ b/seitan-eater/Makefile diff --git a/src/eater/eater.c b/seitan-eater/eater.c index 96a7b61..96a7b61 100644 --- a/src/eater/eater.c +++ b/seitan-eater/eater.c diff --git a/src/seitan/seitan.c b/seitan.c index ff0c54b..ff0c54b 100644 --- a/src/seitan/seitan.c +++ b/seitan.c diff --git a/src/seitan/Makefile b/src/seitan/Makefile deleted file mode 100644 index 8a0c106..0000000 --- a/src/seitan/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# SPDX-License-Identifier: GPL-3.0-or-later -# -# seitan - Syscall Expressive Interpreter, Transformer and Notifier -# -# seitan/Makefile - Makefile for seitan -# -# Copyright 2023 Red Hat GmbH -# Author: Alice Frosi <afrosi@redhat.com> -# Author: Stefano Brivio <sbrivio@redhat.com> - -COMMON_DIR :=../common -SRCS := seitan.c $(COMMON_DIR)/common.c operations.c -HEADERS := $(COMMON_DIR)/common.h $(COMMON_DIR)/gluten.h operations.h -BIN := $(OUTDIR)seitan - -TARGET := $(shell $(CC) -dumpmachine) -# Get 'uname -m'-like architecture description for target -TARGET_ARCH := $(shell echo $(TARGET) | cut -f1 -d- | tr [A-Z] [a-z]) -TARGET_ARCH := $(shell echo $(TARGET_ARCH) | sed 's/powerpc/ppc/') - -AUDIT_ARCH := $(shell echo $(TARGET_ARCH) | tr [a-z] [A-Z] | sed 's/^ARM.*/ARM/') -AUDIT_ARCH := $(shell echo $(AUDIT_ARCH) | sed 's/I[456]86/I386/') -AUDIT_ARCH := $(shell echo $(AUDIT_ARCH) | sed 's/PPC64/PPC/') -AUDIT_ARCH := $(shell echo $(AUDIT_ARCH) | sed 's/PPCLE/PPC64LE/') - -CFLAGS += -DTMP_DATA_SIZE=1000 -CFLAGS += -Wall -Wextra -pedantic -I$(COMMON_DIR) - -seitan: $(SRCS) $(HEADERS) - $(CC) $(CFLAGS) -o $(BIN) $(SRCS) - -all: seitan - -clean: - rm -f $(BIN) |