aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2005-12-27 16:10:15 +0100
committerWilmer van der Gaast <wilmer@gaast.net>2005-12-27 16:10:15 +0100
commite62762bc4b884d576c00fd7a2636b610e7c1b578 (patch)
tree05c582205ba6bcc1dc516a4b91efdb41162e588d
parente4d62711995840def3a2d51f62923d95cb368cee (diff)
Moved util.c to root, moved some things to there from bitlbee.c
-rw-r--r--Makefile2
-rw-r--r--protocols/Makefile2
-rw-r--r--util.c (renamed from protocols/util.c)0
3 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index cc5757dc..2e0d0faa 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@
-include Makefile.settings
# Program variables
-objects = account.o bitlbee.o commands.o conf.o crypting.o help.o ini.o irc.o log.o nick.o query.o set.o storage.o storage_text.o unix.o url.o user.o
+objects = account.o bitlbee.o commands.o conf.o crypting.o help.o ini.o irc.o log.o nick.o query.o set.o storage.o storage_text.o unix.o url.o user.o util.o
subdirs = protocols
# Expansion of variables
diff --git a/protocols/Makefile b/protocols/Makefile
index 1ed6b52e..4016e7fd 100644
--- a/protocols/Makefile
+++ b/protocols/Makefile
@@ -9,7 +9,7 @@
-include ../Makefile.settings
# [SH] Program variables
-objects = http_client.o md5.o nogaim.o proxy.o sha.o $(SSL_CLIENT) util.o
+objects = http_client.o md5.o nogaim.o proxy.o sha.o $(SSL_CLIENT)
# [SH] The next two lines should contain the directory name (in $(subdirs))
# and the name of the object file, which should be linked into
diff --git a/protocols/util.c b/util.c
index 6a2f2e46..6a2f2e46 100644
--- a/protocols/util.c
+++ b/util.c