BUILD : 1.7.8 (654) BUGS : NOTES : DrSteins Makefile Patches...

git-svn-id: svn://svn.anope.org/anope/trunk@654 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@502 5417fbe8-f217-4b02-8779-1006273d7864

5 files changed, 21 insertions, 10 deletions

diff --git a/Changes b/Changes
index 4455ee066..29fb31b26 100644
--- a/Changes
+++ b/Changes
@@ -64,6 +64,7 @@ Provided by Trystan <trystan@nomadirc.net> - 2005
 03/14 R Removed some old irc-services convertor ifdef's                   [#317]
 
 Provided by DrStein <drstein@anope.org> - 2005
+03/22 A Compiling extra tools (db-merger, epona2anope)                    [ #00]
 03/17 A OS SET SQL ON shall warn about SQL disabled in services.conf      [ #00]
 03/15 A ChanServ will now include the channel name in SET's responses     [#318]
 03/15 F ChanServ's do_getkey() function is now using notice_lang()        [#319]
diff --git a/Makefile.in b/Makefile.in
index 94785e842..4b611beb6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -95,5 +95,6 @@ distclean: clean
 install: DUMMY
 	(cd src ; ${MAKE} ${MAKEARGS} install)
 	(cd src/tools ; ${MAKE} ${MAKEARGS} install)
+	@echo "*** All done, Anope is now installed. Please read docs/INSTALL for details on what to do now.";
 
 DUMMY:
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
diff --git a/version.log b/version.log
index 1d5c7bd58..b21155385 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="8"
-VERSION_BUILD="653"
+VERSION_BUILD="654"
 
 # $Log$
 #
+# BUILD : 1.7.8 (654)
+# BUGS  : 
+# NOTES : DrSteins Makefile Patches...
+#
 # BUILD : 1.7.8 (653)
 # BUGS  : 339
 # NOTES : Chanserv now sets topic when channel is recreated.