From b71e06fca8ef172cc1e507635afcb8d925a25822 Mon Sep 17 00:00:00 2001 From: jsteube Date: Sun, 13 Jan 2019 15:28:42 +0100 Subject: [PATCH] Move module sources to src/modules --- modules/.lock | 0 src/Makefile | 12 ++++++------ {modules => src/modules}/module_00000.c | 0 {modules => src/modules}/module_00010.c | 0 {modules => src/modules}/module_00011.c | 0 {modules => src/modules}/module_00100.c | 0 {modules => src/modules}/module_00101.c | 0 {modules => src/modules}/module_00110.c | 0 {modules => src/modules}/module_00200.c | 0 {modules => src/modules}/module_00300.c | 0 {modules => src/modules}/module_00400.c | 0 {modules => src/modules}/module_00500.c | 0 {modules => src/modules}/module_00501.c | 0 {modules => src/modules}/module_00900.c | 0 {modules => src/modules}/module_01000.c | 0 {modules => src/modules}/module_01300.c | 0 {modules => src/modules}/module_01400.c | 0 {modules => src/modules}/module_01600.c | 0 {modules => src/modules}/module_01700.c | 0 {modules => src/modules}/module_02400.c | 0 {modules => src/modules}/module_06300.c | 0 {modules => src/modules}/module_10800.c | 0 22 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 modules/.lock rename {modules => src/modules}/module_00000.c (100%) rename {modules => src/modules}/module_00010.c (100%) rename {modules => src/modules}/module_00011.c (100%) rename {modules => src/modules}/module_00100.c (100%) rename {modules => src/modules}/module_00101.c (100%) rename {modules => src/modules}/module_00110.c (100%) rename {modules => src/modules}/module_00200.c (100%) rename {modules => src/modules}/module_00300.c (100%) rename {modules => src/modules}/module_00400.c (100%) rename {modules => src/modules}/module_00500.c (100%) rename {modules => src/modules}/module_00501.c (100%) rename {modules => src/modules}/module_00900.c (100%) rename {modules => src/modules}/module_01000.c (100%) rename {modules => src/modules}/module_01300.c (100%) rename {modules => src/modules}/module_01400.c (100%) rename {modules => src/modules}/module_01600.c (100%) rename {modules => src/modules}/module_01700.c (100%) rename {modules => src/modules}/module_02400.c (100%) rename {modules => src/modules}/module_06300.c (100%) rename {modules => src/modules}/module_10800.c (100%) diff --git a/modules/.lock b/modules/.lock new file mode 100644 index 000000000..e69de29bb diff --git a/src/Makefile b/src/Makefile index 21b6f51d6..3e2590078 100644 --- a/src/Makefile +++ b/src/Makefile @@ -556,20 +556,20 @@ endif MODULE_DEPEND := src/bitops.c src/convert.c src/memory.c src/shared.c src/cpu_aes.c -MODULES_SRC := $(wildcard modules/*.c) -MODULES_LIB := $(patsubst %.c, %.so, $(MODULES_SRC)) +MODULES_SRC := $(wildcard src/modules/*.c) +MODULES_LIB := $(patsubst src/modules/%.c, modules/%.so, $(MODULES_SRC)) -modules/module_%.so: modules/module_%.c +modules/module_%.so: src/modules/module_%.c $(CC) $(CFLAGS_NATIVE) $< -o $@ -shared -fPIC $(MODULE_DEPEND) -D MODULE_INTERFACE_VERSION_CURRENT=$(MODULE_INTERFACE_VERSION) modules: $(MODULES_LIB) -MODULES_LIB_WIN64 := $(patsubst %.c, %.dll, $(MODULES_SRC)) +MODULES_LIB_WIN64 := $(patsubst src/modules/%.c, modules/%.dll, $(MODULES_SRC)) -modules/module_%.dll: modules/module_%.c - $(CC_WIN_64) $(CFLAGS_CROSS_WIN64) $< -o $@ -shared -fPIC $(MODULE_DEPEND) +modules/module_%.dll: src/modules/module_%.c + $(CC_WIN_64) $(CFLAGS_CROSS_WIN64) $< -o $@ -shared -fPIC $(MODULE_DEPEND) -D MODULE_INTERFACE_VERSION_CURRENT=$(MODULE_INTERFACE_VERSION) modules_win64: $(MODULES_LIB_WIN64) diff --git a/modules/module_00000.c b/src/modules/module_00000.c similarity index 100% rename from modules/module_00000.c rename to src/modules/module_00000.c diff --git a/modules/module_00010.c b/src/modules/module_00010.c similarity index 100% rename from modules/module_00010.c rename to src/modules/module_00010.c diff --git a/modules/module_00011.c b/src/modules/module_00011.c similarity index 100% rename from modules/module_00011.c rename to src/modules/module_00011.c diff --git a/modules/module_00100.c b/src/modules/module_00100.c similarity index 100% rename from modules/module_00100.c rename to src/modules/module_00100.c diff --git a/modules/module_00101.c b/src/modules/module_00101.c similarity index 100% rename from modules/module_00101.c rename to src/modules/module_00101.c diff --git a/modules/module_00110.c b/src/modules/module_00110.c similarity index 100% rename from modules/module_00110.c rename to src/modules/module_00110.c diff --git a/modules/module_00200.c b/src/modules/module_00200.c similarity index 100% rename from modules/module_00200.c rename to src/modules/module_00200.c diff --git a/modules/module_00300.c b/src/modules/module_00300.c similarity index 100% rename from modules/module_00300.c rename to src/modules/module_00300.c diff --git a/modules/module_00400.c b/src/modules/module_00400.c similarity index 100% rename from modules/module_00400.c rename to src/modules/module_00400.c diff --git a/modules/module_00500.c b/src/modules/module_00500.c similarity index 100% rename from modules/module_00500.c rename to src/modules/module_00500.c diff --git a/modules/module_00501.c b/src/modules/module_00501.c similarity index 100% rename from modules/module_00501.c rename to src/modules/module_00501.c diff --git a/modules/module_00900.c b/src/modules/module_00900.c similarity index 100% rename from modules/module_00900.c rename to src/modules/module_00900.c diff --git a/modules/module_01000.c b/src/modules/module_01000.c similarity index 100% rename from modules/module_01000.c rename to src/modules/module_01000.c diff --git a/modules/module_01300.c b/src/modules/module_01300.c similarity index 100% rename from modules/module_01300.c rename to src/modules/module_01300.c diff --git a/modules/module_01400.c b/src/modules/module_01400.c similarity index 100% rename from modules/module_01400.c rename to src/modules/module_01400.c diff --git a/modules/module_01600.c b/src/modules/module_01600.c similarity index 100% rename from modules/module_01600.c rename to src/modules/module_01600.c diff --git a/modules/module_01700.c b/src/modules/module_01700.c similarity index 100% rename from modules/module_01700.c rename to src/modules/module_01700.c diff --git a/modules/module_02400.c b/src/modules/module_02400.c similarity index 100% rename from modules/module_02400.c rename to src/modules/module_02400.c diff --git a/modules/module_06300.c b/src/modules/module_06300.c similarity index 100% rename from modules/module_06300.c rename to src/modules/module_06300.c diff --git a/modules/module_10800.c b/src/modules/module_10800.c similarity index 100% rename from modules/module_10800.c rename to src/modules/module_10800.c