made the use of run-cc.pl optional, if you dont want to use it, add --with-makebin="" to the ./configure line.

This is very useful for IDEs which parse the gcc output and let you just click on errors, like eclipse and kdevelop :)


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

5 files changed, 21 insertions, 17 deletions

diff --git a/src/Makefile b/src/Makefile
index b70acb6ca..7973ba4d7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -18,13 +18,14 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
            'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
      	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
    	   'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
-	   'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
+	   'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}' \
+	   'MAKEBIN=${MAKEBIN}'
 
 .c.o:
-	@../run-cc.pl $(CC) $(CFLAGS) -I../include/ -c $<
+	@$(MAKEBIN) $(CC) $(CFLAGS) -I../include/ -c $<
 
 .cpp.o:
-	@../run-cc.pl $(CC) $(CFLAGS) -I../include/ -c $<
+	@$(MAKEBIN) $(CC) $(CFLAGS) -I../include/ -c $<
 
 all: services
 
@@ -32,7 +33,7 @@ distclean: spotless
 distclean_modules: clean_modules spotless
 
 services:  $(OBJS) mod_version
-	@../run-cc.pl $(CC) $(CFLAGS) $(OBJS) $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS)
+	@$(MAKEBIN) $(CC) $(CFLAGS) $(OBJS) $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS)
 
 $(OBJS): Makefile
 actions.o:      actions.c   $(INCLUDES)
@@ -76,7 +77,7 @@ users.o:        users.c     $(INCLUDES)
 vsnprintf.o:    vsnprintf.c $(INCLUDES)
 
 mod_version:	mod_version.c	$(INCLUDES)
-	@../run-cc.pl $(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 c989ac026..1fba36e5e 100644
--- a/src/core/Makefile
+++ b/src/core/Makefile
@@ -5,7 +5,8 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
            'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
       	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
    	   'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
-	   'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
+	   'PROFILE=${PROFILE}' 'SHARED=${SHARED}' \
+	   'MODULEFLAGS=${MODULEFLAGS}' 'MAKEBIN=${MAKEBIN}'
 
 OBJECTS= $(SRCS:.c=.o)
 SO_FILES=$(OBJECTS:.o=.s)
@@ -21,10 +22,10 @@ install:
 distclean: spotless
 
 .c.o:
-	@../../run-cc.pl $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
+	@$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
 
 .o.s:
-	@../../run-cc.pl $(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 59a241694..dce685230 100644
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -5,7 +5,8 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
            'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
       	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
    	   'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
-	   'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
+	   'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'\
+	   'MAKEBIN=${MAKEBIN}'
 
 OBJECTS= $(SRCS:.c=.o)
 SO_FILES=$(OBJECTS:.o=.s)
@@ -24,10 +25,10 @@ install:
 distclean: spotless
 
 .c.o:
-	@../../run-cc.pl $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
+	@$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
 
 .o.s:
-	@../../run-cc.pl $(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 d49a69be5..b1db60771 100644
--- a/src/protocol/Makefile
+++ b/src/protocol/Makefile
@@ -5,7 +5,8 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
            'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
       	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
    	   'RUNGROUP=${RUNGROUP}' 'MODULE_PATH=${MODULE_PATH}' \
-	   'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
+	   'PROFILE=${PROFILE}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'\
+	   'MAKEBIN=${MAKEBIN}'
 
 OBJECTS= $(SRCS:.c=.o)
 OBJECTS+= $(SRCS:.cpp=.o)
@@ -22,13 +23,13 @@ install:
 distclean: clean spotless
 
 .c.o:
-	@../../run-cc.pl $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
+	@$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
 
 .cpp.o:
-	@../../run-cc.pl $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
+	@$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
 
 .o.s:
-	@../../run-cc.pl $(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 2b0679dda..5dfccf9cc 100644
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -7,10 +7,10 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
 	   'LDFLAGS=${LDFLAGS}' 'BINDEST=${BINDEST}' 'INSTALL=${INSTALL}' \
            'INCLUDEDIR=${INCLUDEDIR}' 'RM=${RM}' 'CP=${CP}' \
      	   'TOUCH=${TOUCH}' 'SHELL=${SHELL}' 'DATDEST=${DATDEST}' \
-   	   'RUNGROUP=${RUNGROUP}' 
+   	   'RUNGROUP=${RUNGROUP}' 'MAKEBIN=${MAKEBIN}'
 
 .c.o:
-	@../../run-cc.pl $(CC) $(CFLAGS) -I../include/ -c $<
+	@$(MAKEBIN) $(CC) $(CFLAGS) -I../include/ -c $<
 
 all: ${OBJS}