From bcfc489a18dfa24434b07a466738dec78571f7e1 Mon Sep 17 00:00:00 2001 From: Egor Date: Thu, 19 Oct 2023 14:21:55 +0300 Subject: [PATCH] move sources to src/ --- Makefile | 41 +++++++++++++++++++------------------- common.h => src/common.h | 0 config.h => src/config.h | 0 irc.c => src/irc.c | 0 irc.h => src/irc.h | 0 ircfmt.c => src/ircfmt.c | 0 ircfmt.h => src/ircfmt.h | 0 main.c => src/main.c | 0 net.c => src/net.c | 0 net.h => src/net.h | 0 netsock.c => src/netsock.c | 0 netsock.h => src/netsock.h | 0 passwd.c => src/passwd.c | 0 passwd.h => src/passwd.h | 0 {tools => src}/setpass.c | 2 +- trie.c => src/trie.c | 0 trie.h => src/trie.h | 0 util.c => src/util.c | 0 util.h => src/util.h | 0 19 files changed, 22 insertions(+), 21 deletions(-) rename common.h => src/common.h (100%) rename config.h => src/config.h (100%) rename irc.c => src/irc.c (100%) rename irc.h => src/irc.h (100%) rename ircfmt.c => src/ircfmt.c (100%) rename ircfmt.h => src/ircfmt.h (100%) rename main.c => src/main.c (100%) rename net.c => src/net.c (100%) rename net.h => src/net.h (100%) rename netsock.c => src/netsock.c (100%) rename netsock.h => src/netsock.h (100%) rename passwd.c => src/passwd.c (100%) rename passwd.h => src/passwd.h (100%) rename {tools => src}/setpass.c (89%) rename trie.c => src/trie.c (100%) rename trie.h => src/trie.h (100%) rename util.c => src/util.c (100%) rename util.h => src/util.h (100%) diff --git a/Makefile b/Makefile index 7e42d53..3cc9251 100644 --- a/Makefile +++ b/Makefile @@ -1,33 +1,34 @@ TARGET := ircd SOURCES := \ - main.c \ - irc.c \ - ircfmt.c \ - net.c \ - netsock.c \ - passwd.c \ - trie.c \ - util.c + src/main.c \ + src/irc.c \ + src/ircfmt.c \ + src/net.c \ + src/netsock.c \ + src/passwd.c \ + src/trie.c \ + src/util.c HEADERS := \ - common.h \ - config.h \ - irc.h \ - ircfmt.h \ - net.h \ - netsock.h \ - passwd.h \ - trie.h \ - util.h + src/common.h \ + src/config.h \ + src/irc.h \ + src/ircfmt.h \ + src/net.h \ + src/netsock.h \ + src/passwd.h \ + src/trie.h \ + src/util.h + -include config.mk .PHONY: all clean all: $(TARGET) $(if $(CC.w32),$(TARGET).exe,) setpass clean: - $(RM) $(TARGET) $(TARGET).exe + $(RM) $(TARGET) $(TARGET).exe setpass $(TARGET): $(SOURCES) $(HEADERS) $(CC) $(CFLAGS) $(LDFLAGS) $(SOURCES) $(LDLIBS) -o $@ $(TARGET).exe: $(SOURCES) $(HEADERS) $(CC.w32) $(CFLAGS.w32) $(LDFLAGS.w32) $(SOURCES) $(LDLIBS.w32) -o $@ -setpass: tools/setpass.c passwd.c passwd.h - $(CC) $(CFLAGS) $(LDFLAGS) tools/setpass.c passwd.c $(LDLIBS) -o $@ +setpass: src/setpass.c src/passwd.c src/passwd.h + $(CC) $(CFLAGS) $(LDFLAGS) src/setpass.c src/passwd.c $(LDLIBS) -o $@ diff --git a/common.h b/src/common.h similarity index 100% rename from common.h rename to src/common.h diff --git a/config.h b/src/config.h similarity index 100% rename from config.h rename to src/config.h diff --git a/irc.c b/src/irc.c similarity index 100% rename from irc.c rename to src/irc.c diff --git a/irc.h b/src/irc.h similarity index 100% rename from irc.h rename to src/irc.h diff --git a/ircfmt.c b/src/ircfmt.c similarity index 100% rename from ircfmt.c rename to src/ircfmt.c diff --git a/ircfmt.h b/src/ircfmt.h similarity index 100% rename from ircfmt.h rename to src/ircfmt.h diff --git a/main.c b/src/main.c similarity index 100% rename from main.c rename to src/main.c diff --git a/net.c b/src/net.c similarity index 100% rename from net.c rename to src/net.c diff --git a/net.h b/src/net.h similarity index 100% rename from net.h rename to src/net.h diff --git a/netsock.c b/src/netsock.c similarity index 100% rename from netsock.c rename to src/netsock.c diff --git a/netsock.h b/src/netsock.h similarity index 100% rename from netsock.h rename to src/netsock.h diff --git a/passwd.c b/src/passwd.c similarity index 100% rename from passwd.c rename to src/passwd.c diff --git a/passwd.h b/src/passwd.h similarity index 100% rename from passwd.h rename to src/passwd.h diff --git a/tools/setpass.c b/src/setpass.c similarity index 89% rename from tools/setpass.c rename to src/setpass.c index c3c6dd8..afebf4f 100644 --- a/tools/setpass.c +++ b/src/setpass.c @@ -1,5 +1,5 @@ #include -#include "../passwd.h" +#include "passwd.h" int main(int argc, char **argv) { if (argc < 3) diff --git a/trie.c b/src/trie.c similarity index 100% rename from trie.c rename to src/trie.c diff --git a/trie.h b/src/trie.h similarity index 100% rename from trie.h rename to src/trie.h diff --git a/util.c b/src/util.c similarity index 100% rename from util.c rename to src/util.c diff --git a/util.h b/src/util.h similarity index 100% rename from util.h rename to src/util.h -- 2.56.0