1
0
mirror of https://github.com/anope/anope.git synced 2026-07-05 11:03:12 +02:00

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
This commit is contained in:
robbeh
2008-11-13 20:28:40 +00:00
parent c828c8b92c
commit 40839766c2
9 changed files with 45 additions and 21 deletions
+3 -1
View File
@@ -6,6 +6,7 @@ PROFILE=-pg
LDPROFILE=
SHELL=/bin/sh
BINDEST=@BINDEST@
MAKEBIN=@MAKEBIN@
DATDEST=@DATDEST@
INSTALL=@INSTALL@
RM=@RM@
@@ -25,7 +26,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}' \
'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}' \
'MAKEBIN=${MAKEBIN}'
build: language headers
@${MAKE} -C src ${MAKEARGS} all
Vendored
+14 -1
View File
@@ -670,6 +670,7 @@ SHARED
MODULEFLAGS
RUNGROUP
BINDEST
MAKEBIN
DATDEST
MODULE_PATH
LIBOBJS
@@ -1257,6 +1258,7 @@ Optional Packages:
--with-rungroup=group Specify the rungroup for anope
--with-permissions=permissions Specify the default permissions for anope
--with-bindir=bindir Specify the default binary dir for anope
--with-makebin=run-cc.pl Specify the default make binary to use
--with-datadir=datadir Specify the location of the services data folder
Some influential environment variables:
@@ -7764,6 +7766,16 @@ _ACEOF
fi
MAKEBIN=`pwd`/run-cc.pl
# Check whether --with-makebin was given.
if test "${with_makebin+set}" = set; then
withval=$with_makebin; MAKEBIN=$withval
fi
@@ -8465,13 +8477,14 @@ SHARED!$SHARED$ac_delim
MODULEFLAGS!$MODULEFLAGS$ac_delim
RUNGROUP!$RUNGROUP$ac_delim
BINDEST!$BINDEST$ac_delim
MAKEBIN!$MAKEBIN$ac_delim
DATDEST!$DATDEST$ac_delim
MODULE_PATH!$MODULE_PATH$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 61; then
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+5
View File
@@ -254,7 +254,12 @@ AC_ARG_WITH(bindir, [ --with-bindir=bindir Specify the default binary dir fo
MODULE_PATH=${withval}/modules/
])
MAKEBIN=`pwd`/run-cc.pl
AC_ARG_WITH(makebin, [--with-makebin=run-cc.pl Specify the default make binary to use],[MAKEBIN=$withval])
AC_SUBST(BINDEST)
AC_SUBST(MAKEBIN)
AC_ARG_WITH(datadir, [ --with-datadir=datadir Specify the location of the services data folder], [
AC_DEFINE_UNQUOTED(SERVICES_DIR,"$withval","services bin dir")
+2 -2
View File
@@ -4,7 +4,7 @@ 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}'
LANGOBJS = cat de en_us es fr gr hun it nl pl pt ru tr
LANGSRCS = cat.l de.l en_us.l es.l fr.l gr.l hun.l it.l nl.l pl.l pt.l ru.l tr.l
@@ -71,7 +71,7 @@ tr: tr.l langcomp index
@./langcomp $@.l
langcomp: langcomp.c
@../run-cc.pl $(CC) $(CFLAGS) langcomp.c -o $@
@$(MAKEBIN) $(CC) $(CFLAGS) langcomp.c -o $@
language.h: index Makefile
+6 -5
View File
@@ -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
+4 -3
View File
@@ -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:
+4 -3
View File
@@ -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:
+5 -4
View File
@@ -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:
+2 -2
View File
@@ -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}