Relocate modules to resolve a build annoyance.

kuroko-lang · Apr 27, 2021 · 300d644 · 300d644
1 parent 0917abe
commit 300d644
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -4,9 +4,9 @@ CFLAGS += -Isrc
 LDFLAGS += -L.
 
 TARGET   = kuroko
-OBJS     = $(patsubst %.c, %.o, $(filter-out src/module_% src/kuroko.c,$(sort $(wildcard src/*.c))))
+OBJS     = $(patsubst %.c, %.o, $(filter-out src/kuroko.c,$(sort $(wildcard src/*.c))))
 SOOBJS   = $(patsubst %.o, %.lo, $(OBJS))
-MODULES  = $(patsubst src/module_%.c, modules/%.so, $(sort $(wildcard src/module_*.c)))
+MODULES  = $(patsubst src/modules/module_%.c, modules/%.so, $(sort $(wildcard src/modules/module_*.c)))
 HEADERS  = $(wildcard src/kuroko/*.h)
 TOOLS    = $(patsubst tools/%.c, krk-%, $(sort $(wildcard tools/*.c)))
 GENMODS  = modules/codecs/sbencs.krk modules/codecs/dbdata.krk
@@ -113,7 +113,7 @@ libkuroko.a: ${OBJS}
 	${CC} ${CFLAGS} -fPIC -c -o $@ $<
 
 modules/math.so: MODLIBS += -lm
-modules/%.so: src/module_%.c ${LIBRARY}
+modules/%.so: src/modules/module_%.c ${LIBRARY}
 	${CC} ${CFLAGS} ${LDFLAGS} -fPIC -shared -o $@ $< ${LDLIBS} ${MODLIBS}
 
 modules/codecs/sbencs.krk: tools/codectools/gen_sbencs.krk tools/codectools/encodings.json tools/codectools/indexes.json | kuroko

diff --git a/src/module_math.c → src/modules/module_math.c b/src/module_math.c → src/modules/module_math.c
diff --git a/src/module_socket.c → src/modules/module_socket.c b/src/module_socket.c → src/modules/module_socket.c
diff --git a/src/module_timeit.c → src/modules/module_timeit.c b/src/module_timeit.c → src/modules/module_timeit.c