From 00aa4a0ad4ad0da50619b0df3dd7f312b20a1353 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Mon, 28 Jun 2010 00:32:50 -0400
Subject: Fixed the makefiles to correctly build and install the new anopesmtp
 and db-convert

---
 src/tools/Makefile | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/Makefile b/src/tools/Makefile
index 51b24bcd4..95f1e6b9a 100644
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -1,5 +1,5 @@
-SRCS =  anopesmtp.c db-convert.c
-OBJS =  $(SRCS:.c=.o)
+SRCS =  anopesmtp.cpp db-convert.cpp
+OBJS =  $(SRCS:.cpp=)
 
 INCLUDES = ../../include/services.h
 
@@ -9,28 +9,23 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
      	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' \
    	   'RUNGROUP=${RUNGROUP}' 'MAKEBIN=${MAKEBIN}'
 
-.c.o:
-	$(MAKEBIN) $(CC) $(CFLAGS) -I../../include/ -c $<
+.cpp:
+	$(MAKEBIN) $(CC) $(CFLAGS) -I../../include/ ../hashcomp.o $< -o $@
 
 all: ${OBJS}
 
 distclean: spotless
 
-anopesmtp: anopesmtp.o
-	$(CC) $(CFLAGS) anopesmtp.o $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS)
-db-convert: db-convert.o
-	$(CC) $(CFLAGS) db-convert.o $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS)
-
 $(OBJS): Makefile
-anopesmtp.o:    anopesmtp.c $(INCLUDES)
-db-convert.o:	db-convert.c $(INCLUDES)
+anopesmtp:    anopesmtp.cpp $(INCLUDES)
+db-convert:	  db-convert.cpp $(INCLUDES)
 
 clean:
 	rm -f *.o anopesmtp a.out db-convert
 
 spotless: clean
 
-install: anopesmtp db-convert
+install:
 	test -d ${INSTDIR} || mkdir ${INSTDIR}
 	test -d $(INSTDIR)/bin || mkdir $(INSTDIR)/bin
 	$(INSTALL) anopesmtp $(INSTDIR)/bin/anopesmtp
-- 
cgit