--- rpl/src/Makefile.am	2013/04/27 08:56:25	1.88
+++ rpl/src/Makefile.am	2013/05/24 18:21:02	1.89
@@ -413,24 +413,24 @@ rpl.inc:
 		sed -e '1,$$s/=\\"/="\\"/g' | sed -e '1,$$s/\\" /\\"" /g' >> $@
 	@echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ @ZLIB@ >> $@
 	@echo OBJECTS=$(SRCCc:.c=.$(OBJEXT)) $(SRCFc:.f=.$(OBJEXT)) \
-			$(SRCF90c:.F90=.$(OBJEXT)) \
+			$(SRCF90c:.F90=.$(OBJEXT)) $(SRCCPPc:.cpp=.$(OBJEXT)) \
 			librpl-conv.$(OBJEXT) >> $@
 	@echo EXTOBJECTS= @EXT_SQL@ \
-		$(top_builddir)/lapack/lapack/liblapack.a \
-		$(top_builddir)/lapack/blas/libblas.a \
-		$(ldadd_libhistory) \
-		$(ldadd_libreadline) \
-		$(ldadd_libncurses) \
-		$(ldadd_libgsl) \
-		$(ldadd_libiconv) \
-		$(ldadd_libcrypto) \
-		$(ldadd_libssl) \
-		$(ldadd_libsqlite) \
-		$(ldadd_librplcas) \
-		$(ldadd_libsigsegv) \
-		$(ldadd_libmotif) \
-		$(ldadd_libz) \
-		>> $@
+			$(top_builddir)/lapack/lapack/liblapack.a \
+			$(top_builddir)/lapack/blas/libblas.a \
+			$(ldadd_libhistory) \
+			$(ldadd_libreadline) \
+			$(ldadd_libncurses) \
+			$(ldadd_libgsl) \
+			$(ldadd_libiconv) \
+			$(ldadd_libcrypto) \
+			$(ldadd_libssl) \
+			$(ldadd_libsqlite) \
+			$(ldadd_librplcas) \
+			$(ldadd_libsigsegv) \
+			$(ldadd_libmotif) \
+			$(ldadd_libz) \
+			>> $@
 
 EXTRA_DIST = $(SRCC) $(SRCH) $(SRCCPP) $(SRCF) $(SRCF90) $(SRCINC) \
 		$(INIT_EXE) $(INIT_LIB) $(SRCXPM) \
@@ -452,6 +452,7 @@ rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXP
 rpl_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \
 		 -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@ \
 		 -Wconversion
+rpl_CXXFLAGS = $(AM_CFLAGS) -Wall -Wextra
 rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c
 rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-underscore -fno-f2c
 
@@ -461,6 +462,7 @@ nodist_librpl_a_SOURCES = \
 librpl_a_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \
 		-Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@ \
 		-Wconversion
+librpl_a_CXXFLAGS = $(AM_CFLAGS) -Wall -Wextra
 librpl_a_FFLAGS = $(AM_FFLAGS) -ff2c
 librpl_a_FCFLAGS = $(AM_FCLAGS) -fno-second-underscore
 
@@ -494,7 +496,7 @@ rpl_LDADD = -lgfortran \
 always: $(top_builddir)/src/rpl-conv.c
 	@touch $<;
 	@if [ x$(shell which ctags) != x ]; then \
-   		(cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) \
+   		(cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) $(SRCCPP) \
 				$(INIT_LIB) $(INIT_EXE) 2>&1 /dev/null); \
 	fi;