summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/tools/Makefile19
-rw-r--r--src/tools/README4
2 files changed, 14 insertions, 9 deletions
diff --git a/src/tools/Makefile b/src/tools/Makefile
index 7b3510539..d28b68981 100644
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -1,5 +1,5 @@
-OBJS = anopesmtp.o
-SRCS = anopesmtp.c
+OBJS = $(SRCS:.c=.o)
+SRCS = anopesmtp.c db-merger.c epona2anope.c
INCLUDES = ../../include/services.h
@@ -12,7 +12,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
.c.o:
$(CC) $(CFLAGS) -I../include/ -c $<
-all: anopesmtp
+all: ${OBJS}
distclean: clean spotless
@@ -20,15 +20,20 @@ anopesmpt: $(OBJS)
$(CC) $(CFLAGS) $(OBJS) $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS)
$(OBJS): Makefile
-anopesmpt.o: anopesmpt.c $(INCLUDES)
+anopesmtp.o: anopesmtp.c $(INCLUDES)
+db-merger.o: db-merger.c $(INCLUDES)
+epona2anope.o: epona2anope.c $(INCLUDES)
clean:
- rm -f *.o anopesmtp a.out
+ rm -f *.o anopesmtp a.out db-merger epona2anope
spotless: clean
-install: anopesmtp
+install: anopesmtp db-merger epona2anope
test -d ${BINDEST} || mkdir ${BINDEST}
- $(INSTALL) anopesmtp $(BINDEST)/anopesmtp
+ test -d $(BINDEST)/tools || mkdir $(BINDEST)/tools
+ $(INSTALL) anopesmtp $(BINDEST)/tools/anopesmtp
+ $(INSTALL) db-merger $(BINDEST)/tools/db-merger
+ $(INSTALL) epona2anope $(BINDEST)/tools/epona2anope
DUMMY:
diff --git a/src/tools/README b/src/tools/README
index 331beb757..3acb80ad2 100644
--- a/src/tools/README
+++ b/src/tools/README
@@ -14,10 +14,10 @@ Anope Bundled Tools
options. To use the SMTP client instead of sendmail, find the line in your
services configuration file (services.conf) that defines SendMailPath. On
that line, change the path to your services installation directory, then
- followed by "anopesmtp" and the IP address of a valid SMTP server. It
+ followed by "tools/anopesmtp" and the IP address of a valid SMTP server. It
should look like this:
- SendMailPath "/home/anope/services/anopesmtp 127.0.0.1"
+ SendMailPath "/home/anope/services/tools/anopesmtp 127.0.0.1"
If the SMTP client doesn't send mail, or if there's an other problem with
it, you can compile it in debug mode. To do this, open smtp.h, and look