Fixed Makefiles to only suppress building when using run-cc.pl

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

8 files changed, 19 insertions, 16 deletions

diff --git a/TODO b/TODO
index 7ca661cc2..aa6e116e2 100644
--- a/TODO
+++ b/TODO
@@ -19,7 +19,6 @@ Legend:
 
 Outstanding issues:
 - Correct CMake's auto-library search
-- Check Autotools build system to make sure it still works
 - Add some events that were not present before but useful for future versions
 
 1.9.2
diff --git a/configure b/configure
index 04995434f..76559d6db 100755
--- a/configure
+++ b/configure
@@ -6891,6 +6891,10 @@ if test "${with_makebin+set}" = set; then
   withval=$with_makebin; MAKEBIN=$withval
 fi
 
+# If we're using run-cc.pl suppress the make process (run-cc.pl does it for us)
+if test "$MAKEBIN"; then
+	MAKEBIN="@$MAKEBIN"
+fi
 
 
 
diff --git a/lang/Makefile b/lang/Makefile
index 55198e01c..be9649836 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -71,7 +71,7 @@ tr:       tr.l       langcomp index
 	@./langcomp $@.l $@
 
 langcomp: langcomp.c
-	@$(MAKEBIN) $(CC) $(CFLAGS) langcomp.c -o $@
+	$(MAKEBIN) $(CC) $(CFLAGS) langcomp.c -o $@
 
 
 language.h: index Makefile
diff --git a/src/Makefile b/src/Makefile
index a68409220..a76a13112 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -19,10 +19,10 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
 	   'MAKEBIN=${MAKEBIN}'
 
 .c.o:
-	@$(MAKEBIN) $(CC) $(CFLAGS) -I../include/ -c $<
+	$(MAKEBIN) $(CC) $(CFLAGS) -I../include/ -c $<
 
 .cpp.o:
-	@$(MAKEBIN) $(CC) $(CFLAGS) -I../include/ -c $<
+	$(MAKEBIN) $(CC) $(CFLAGS) -I../include/ -c $<
 
 all: services
 
@@ -30,7 +30,7 @@ distclean: spotless
 distclean_modules: clean_modules spotless
 
 services:  $(OBJS) mod_version
-	@$(MAKEBIN) $(CC) $(CFLAGS) $(OBJS) $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS)
+	$(MAKEBIN) $(CC) $(CFLAGS) $(OBJS) $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS)
 
 $(OBJS): Makefile
 timers.o:	timers.cpp $(INCLUDES)
@@ -78,7 +78,7 @@ vsnprintf.o:    vsnprintf.c $(INCLUDES)
 wildcard.o:     wildcard.cpp $(INCLUDES)
 
 mod_version:	mod_version.c	$(INCLUDES)
-	@$(MAKEBIN) $(CC) $(CDEFS) $(CFLAGS) $(MODULEFLAGS) -I../include/ -c mod_version.c
+	$(MAKEBIN) $(CC) $(CDEFS) $(CFLAGS) $(MODULEFLAGS) -I../include/ -c mod_version.c
 
 modules: DUMMY
 	@modules/configure modules
diff --git a/src/core/Makefile b/src/core/Makefile
index 25aac058d..7065c03aa 100644
--- a/src/core/Makefile
+++ b/src/core/Makefile
@@ -23,13 +23,13 @@ install:
 distclean: spotless
 
 .c.o:
-	@$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
+	$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
 
 .cpp.o:
-	@$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
+	$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
 
 .o.s:
-	@$(MAKEBIN) $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
+	$(MAKEBIN) $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
 	@$(TOUCH) $*.s
 
 subs:
diff --git a/src/modules/Makefile b/src/modules/Makefile
index b75071a75..531e01736 100644
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -26,13 +26,13 @@ install:
 distclean: spotless
 
 .c.o:
-	@$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
+	$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
 
 .cpp.o:
-	@$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
+	$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
 
 .o.s:
-	@$(MAKEBIN) $(CC) ${SHARED} ../mod_version.o $< -o $*.so  ${PROFILE}
+	$(MAKEBIN) $(CC) ${SHARED} ../mod_version.o $< -o $*.so  ${PROFILE}
 	@$(TOUCH) $*.s
 
 subs:
diff --git a/src/protocol/Makefile b/src/protocol/Makefile
index 3e31ec2e4..9cef64955 100644
--- a/src/protocol/Makefile
+++ b/src/protocol/Makefile
@@ -23,13 +23,13 @@ install:
 distclean: clean spotless
 
 .c.o:
-	@$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
+	$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
 
 .cpp.o:
-	@$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
+	$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
 
 .o.s:
-	@$(MAKEBIN) $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
+	$(MAKEBIN) $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
 	@$(TOUCH) $*.s
 
 subs:
diff --git a/src/tools/Makefile b/src/tools/Makefile
index ace5b645e..bb6998db6 100644
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -10,7 +10,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
    	   'RUNGROUP=${RUNGROUP}' 'MAKEBIN=${MAKEBIN}'
 
 .c.o:
-	@$(MAKEBIN) $(CC) $(CFLAGS) -I../../include/ -c $<
+	$(MAKEBIN) $(CC) $(CFLAGS) -I../../include/ -c $<
 
 all: ${OBJS}