Fixed Autotools to detect *.cpp files in the src/core and src/modules folders.

Also small fix to the Windows install.js call to CMake to include quotes around the source's path.

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

install.js

@@ -214,7 +214,7 @@ for (x in installerQuestions) {
 	var thisQuestion = installerQuestions[x];
 	cmake += ' ' + thisQuestion.cmake_argument();
 }
-cmake += ' ' + ScriptPath;
+cmake += ' "' + ScriptPath + '"';
 WScript.Echo(cmake + "\n");
 
 var shell = WScript.CreateObject('WScript.Shell');

src/core/Makefile

@@ -9,6 +9,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
 	   'MODULEFLAGS=${MODULEFLAGS}' 'MAKEBIN=${MAKEBIN}'
 
 OBJECTS= $(SRCS:.c=.o)
+OBJECTS+= $(SRCS:.cpp=.o)
 SO_FILES=$(OBJECTS:.o=.s)
 CDEFS= -rdynamic -Wall
 
@@ -24,6 +25,9 @@ distclean: spotless
 .c.o:
 	@$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
 
+.cpp.o:
+	@$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
+
 .o.s:
 	@$(MAKEBIN) $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
 	@$(TOUCH) $*.s
@@ -42,5 +46,5 @@ clean: subs_clean
 	rm -f *.o *.s *.so *.c~ core
 
 spotless: subs_clean
-	rm -f *.o *.s *.so *.c~ core Makefile.inc
+	rm -f *.o *.s *.so *.c~ core *.so Makefile.inc
 

src/core/configure

@@ -26,7 +26,7 @@ export ECHO2 ECHO2SUF
 
 echo2 "SRCS=" > ./Makefile.inc
 FIRST=1
-for oldfile in *.c
+for oldfile in `ls -1 *.c *.cpp`
 do
 	if [ "$FIRST" = 1 ] ; then
 		echo2 " "$oldfile >> ./Makefile.inc

src/modules/Makefile

@@ -9,6 +9,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
 	   'MAKEBIN=${MAKEBIN}'
 
 OBJECTS= $(SRCS:.c=.o)
+OBJECTS+= $(SRCS:.cpp=.o)
 SO_FILES=$(OBJECTS:.o=.s)
 CDEFS= -rdynamic -Wall
 
@@ -27,6 +28,9 @@ distclean: spotless
 .c.o:
 	@$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
 
+.cpp.o:
+	@$(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
+
 .o.s:
 	@$(MAKEBIN) $(CC) ${SHARED} ../mod_version.o $< -o $*.so  ${PROFILE}
 	@$(TOUCH) $*.s

src/modules/configure

@@ -26,7 +26,7 @@ export ECHO2 ECHO2SUF
 
 echo2 "SRCS=" > ./Makefile.inc
 FIRST=1
-for oldfile in *.c
+for oldfile in `ls -1 *.c *.cpp`
 do
 	if [ "$FIRST" = 1 ] ; then
 		echo2 " "$oldfile >> ./Makefile.inc

src/protocol/Makefile

@@ -29,7 +29,7 @@ distclean: clean spotless
 	@$(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: