From e4fcf7471a1319fee99d68de729aaacfeb044d01 Mon Sep 17 00:00:00 2001 From: Nakidai Date: Thu, 19 Feb 2026 00:13:27 +0300 Subject: Rename sub-Makefiles into build.mk So now it is impossible to accidentally start from the wrong place, and this structure also implicitly tells you how to build --- Makefile | 2 +- src/Makefile | 15 --------------- src/build.mk | 15 +++++++++++++++ src/ipaddr/Makefile | 4 ---- src/ipaddr/build.mk | 4 ++++ src/ngircd/Makefile | 40 ---------------------------------------- src/ngircd/build.mk | 40 ++++++++++++++++++++++++++++++++++++++++ src/portab/Makefile | 11 ----------- src/portab/build.mk | 11 +++++++++++ src/tool/Makefile | 4 ---- src/tool/build.mk | 4 ++++ 11 files changed, 75 insertions(+), 75 deletions(-) delete mode 100644 src/Makefile create mode 100644 src/build.mk delete mode 100644 src/ipaddr/Makefile create mode 100644 src/ipaddr/build.mk delete mode 100644 src/ngircd/Makefile create mode 100644 src/ngircd/build.mk delete mode 100644 src/portab/Makefile create mode 100644 src/portab/build.mk delete mode 100644 src/tool/Makefile create mode 100644 src/tool/build.mk diff --git a/Makefile b/Makefile index b8800555..602d9575 100644 --- a/Makefile +++ b/Makefile @@ -5,4 +5,4 @@ all: src/ngircd/ngircd .c.o: ${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $< -include src/Makefile +include src/build.mk diff --git a/src/Makefile b/src/Makefile deleted file mode 100644 index 07adc0cb..00000000 --- a/src/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -include src/ipaddr/Makefile -include src/ngircd/Makefile -include src/portab/Makefile -include src/tool/Makefile - -LDFLAGS += -Lsrc/portab -Lsrc/tool -Lsrc/ipaddr -LDLIBS += -lngportab -lngtool -lngipaddr -lz - -CFLAGS += -DDOCDIR='"/usr/local/share/doc/ngircd"' -CFLAGS += -DHAVE_CONFIG_H -CFLAGS += -Isrc -Isrc/portab -Isrc/ipaddr -Isrc/tool - -clean: - rm -f src/ngircd/ngircd - find . \( -name '*\.o' -o -name '*\.a' \) -exec rm {} \; diff --git a/src/build.mk b/src/build.mk new file mode 100644 index 00000000..ab9f0a39 --- /dev/null +++ b/src/build.mk @@ -0,0 +1,15 @@ +include src/ipaddr/build.mk +include src/ngircd/build.mk +include src/portab/build.mk +include src/tool/build.mk + +LDFLAGS += -Lsrc/portab -Lsrc/tool -Lsrc/ipaddr +LDLIBS += -lngportab -lngtool -lngipaddr -lz + +CFLAGS += -DDOCDIR='"/usr/local/share/doc/ngircd"' +CFLAGS += -DHAVE_CONFIG_H +CFLAGS += -Isrc -Isrc/portab -Isrc/ipaddr -Isrc/tool + +clean: + rm -f src/ngircd/ngircd + find . \( -name '*\.o' -o -name '*\.a' \) -exec rm {} \; diff --git a/src/ipaddr/Makefile b/src/ipaddr/Makefile deleted file mode 100644 index e40388bb..00000000 --- a/src/ipaddr/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -OBJS.ipaddr += src/ipaddr/ng_ipaddr.o - -src/ipaddr/libngipaddr.a: ${OBJS.ipaddr} - ar rcs src/ipaddr/libngipaddr.a ${OBJS.ipaddr} diff --git a/src/ipaddr/build.mk b/src/ipaddr/build.mk new file mode 100644 index 00000000..e40388bb --- /dev/null +++ b/src/ipaddr/build.mk @@ -0,0 +1,4 @@ +OBJS.ipaddr += src/ipaddr/ng_ipaddr.o + +src/ipaddr/libngipaddr.a: ${OBJS.ipaddr} + ar rcs src/ipaddr/libngipaddr.a ${OBJS.ipaddr} diff --git a/src/ngircd/Makefile b/src/ngircd/Makefile deleted file mode 100644 index 57d48936..00000000 --- a/src/ngircd/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -OBJS.ngircd += src/ngircd/array.o -OBJS.ngircd += src/ngircd/channel.o -OBJS.ngircd += src/ngircd/class.o -OBJS.ngircd += src/ngircd/client-cap.o -OBJS.ngircd += src/ngircd/client.o -OBJS.ngircd += src/ngircd/conf.o -OBJS.ngircd += src/ngircd/conn-encoding.o -OBJS.ngircd += src/ngircd/conn-func.o -OBJS.ngircd += src/ngircd/conn-ssl.o -OBJS.ngircd += src/ngircd/conn-zip.o -OBJS.ngircd += src/ngircd/conn.o -OBJS.ngircd += src/ngircd/hash.o -OBJS.ngircd += src/ngircd/io.o -OBJS.ngircd += src/ngircd/irc-cap.o -OBJS.ngircd += src/ngircd/irc-channel.o -OBJS.ngircd += src/ngircd/irc-encoding.o -OBJS.ngircd += src/ngircd/irc-info.o -OBJS.ngircd += src/ngircd/irc-login.o -OBJS.ngircd += src/ngircd/irc-metadata.o -OBJS.ngircd += src/ngircd/irc-mode.o -OBJS.ngircd += src/ngircd/irc-op.o -OBJS.ngircd += src/ngircd/irc-oper.o -OBJS.ngircd += src/ngircd/irc-server.o -OBJS.ngircd += src/ngircd/irc-write.o -OBJS.ngircd += src/ngircd/irc.o -OBJS.ngircd += src/ngircd/lists.o -OBJS.ngircd += src/ngircd/log.o -OBJS.ngircd += src/ngircd/login.o -OBJS.ngircd += src/ngircd/match.o -OBJS.ngircd += src/ngircd/ngircd.o -OBJS.ngircd += src/ngircd/numeric.o -OBJS.ngircd += src/ngircd/op.o -OBJS.ngircd += src/ngircd/pam.o -OBJS.ngircd += src/ngircd/parse.o -OBJS.ngircd += src/ngircd/proc.o -OBJS.ngircd += src/ngircd/resolve.o -OBJS.ngircd += src/ngircd/sighandlers.o - -src/ngircd/ngircd: src/portab/libngportab.a src/ipaddr/libngipaddr.a src/tool/libngtool.a ${OBJS.ngircd} - cc -o src/ngircd/ngircd ${LDFLAGS} ${OBJS.ngircd} ${LDLIBS} diff --git a/src/ngircd/build.mk b/src/ngircd/build.mk new file mode 100644 index 00000000..57d48936 --- /dev/null +++ b/src/ngircd/build.mk @@ -0,0 +1,40 @@ +OBJS.ngircd += src/ngircd/array.o +OBJS.ngircd += src/ngircd/channel.o +OBJS.ngircd += src/ngircd/class.o +OBJS.ngircd += src/ngircd/client-cap.o +OBJS.ngircd += src/ngircd/client.o +OBJS.ngircd += src/ngircd/conf.o +OBJS.ngircd += src/ngircd/conn-encoding.o +OBJS.ngircd += src/ngircd/conn-func.o +OBJS.ngircd += src/ngircd/conn-ssl.o +OBJS.ngircd += src/ngircd/conn-zip.o +OBJS.ngircd += src/ngircd/conn.o +OBJS.ngircd += src/ngircd/hash.o +OBJS.ngircd += src/ngircd/io.o +OBJS.ngircd += src/ngircd/irc-cap.o +OBJS.ngircd += src/ngircd/irc-channel.o +OBJS.ngircd += src/ngircd/irc-encoding.o +OBJS.ngircd += src/ngircd/irc-info.o +OBJS.ngircd += src/ngircd/irc-login.o +OBJS.ngircd += src/ngircd/irc-metadata.o +OBJS.ngircd += src/ngircd/irc-mode.o +OBJS.ngircd += src/ngircd/irc-op.o +OBJS.ngircd += src/ngircd/irc-oper.o +OBJS.ngircd += src/ngircd/irc-server.o +OBJS.ngircd += src/ngircd/irc-write.o +OBJS.ngircd += src/ngircd/irc.o +OBJS.ngircd += src/ngircd/lists.o +OBJS.ngircd += src/ngircd/log.o +OBJS.ngircd += src/ngircd/login.o +OBJS.ngircd += src/ngircd/match.o +OBJS.ngircd += src/ngircd/ngircd.o +OBJS.ngircd += src/ngircd/numeric.o +OBJS.ngircd += src/ngircd/op.o +OBJS.ngircd += src/ngircd/pam.o +OBJS.ngircd += src/ngircd/parse.o +OBJS.ngircd += src/ngircd/proc.o +OBJS.ngircd += src/ngircd/resolve.o +OBJS.ngircd += src/ngircd/sighandlers.o + +src/ngircd/ngircd: src/portab/libngportab.a src/ipaddr/libngipaddr.a src/tool/libngtool.a ${OBJS.ngircd} + cc -o src/ngircd/ngircd ${LDFLAGS} ${OBJS.ngircd} ${LDLIBS} diff --git a/src/portab/Makefile b/src/portab/Makefile deleted file mode 100644 index a184ead2..00000000 --- a/src/portab/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -OBJS.portab += src/portab/ansi2knr.o -OBJS.portab += src/portab/portabtest.o -OBJS.portab += src/portab/strdup.o -OBJS.portab += src/portab/strlcpy.o -OBJS.portab += src/portab/strndup.o -OBJS.portab += src/portab/strtok_r.o -OBJS.portab += src/portab/vsnprintf.o -OBJS.portab += src/portab/waitpid.o - -src/portab/libngportab.a: ${OBJS.portab} - ar rcs src/portab/libngportab.a ${OBJS.portab} diff --git a/src/portab/build.mk b/src/portab/build.mk new file mode 100644 index 00000000..a184ead2 --- /dev/null +++ b/src/portab/build.mk @@ -0,0 +1,11 @@ +OBJS.portab += src/portab/ansi2knr.o +OBJS.portab += src/portab/portabtest.o +OBJS.portab += src/portab/strdup.o +OBJS.portab += src/portab/strlcpy.o +OBJS.portab += src/portab/strndup.o +OBJS.portab += src/portab/strtok_r.o +OBJS.portab += src/portab/vsnprintf.o +OBJS.portab += src/portab/waitpid.o + +src/portab/libngportab.a: ${OBJS.portab} + ar rcs src/portab/libngportab.a ${OBJS.portab} diff --git a/src/tool/Makefile b/src/tool/Makefile deleted file mode 100644 index a60eceee..00000000 --- a/src/tool/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -OBJS.tool += src/tool/tool.o - -src/tool/libngtool.a: ${OBJS.tool} - ar rcs src/tool/libngtool.a ${OBJS.tool} diff --git a/src/tool/build.mk b/src/tool/build.mk new file mode 100644 index 00000000..a60eceee --- /dev/null +++ b/src/tool/build.mk @@ -0,0 +1,4 @@ +OBJS.tool += src/tool/tool.o + +src/tool/libngtool.a: ${OBJS.tool} + ar rcs src/tool/libngtool.a ${OBJS.tool} -- cgit 1.4.1