From a9c1f3080b09e59d59c837edc106f89d4dd2c58d Mon Sep 17 00:00:00 2001
From: Yevgen Muntyan <17531749+muntyan@users.noreply.github.com>
Date: Mon, 18 Aug 2008 17:40:58 -0500
Subject: [PATCH] More little cleanup for C++

---
 moo.mprj          | 4 ++++
 tests/Makefile.am | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/moo.mprj b/moo.mprj
index 7754cd0a..aa3e1c99 100644
--- a/moo.mprj
+++ b/moo.mprj
@@ -9,6 +9,10 @@
    <build_dir>build/debug</build_dir>
    <configure>
     <args>--enable-debug --enable-all-warnings --enable-project --enable-unit-tests --prefix=${PREFIX:-/usr/local}</args>
+    <vars>
+     <var name="CC">gcc-4.2</var>
+     <var name="CXX">g++-4.2</var>
+    </vars>
    </configure>
   </debug>
   <gtk-2.6>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4cec8969..ad937480 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,12 +10,12 @@ if MOO_ENABLE_UNIT_TESTS
 TESTS = run-tests
 endif
 
-AM_CFLAGS =			\
-	$(MOO_CFLAGS)		\
-	$(MOO_DEBUG_CFLAGS)
+AM_CFLAGS = $(MOO_CFLAGS)
+AM_CXXFLAGS = $(MOO_CXXFLAGS)
 
 if MOO_ENABLE_UNIT_TESTS
 AM_CFLAGS += -DSRCDIR=\"$(shell cd $(srcdir) && pwd)\" -DTOP_SRCDIR=\"$(shell cd $(top_srcdir) && pwd)\"
+AM_CXXFLAGS += -DSRCDIR=\"$(shell cd $(srcdir) && pwd)\" -DTOP_SRCDIR=\"$(shell cd $(top_srcdir) && pwd)\"
 endif
 
 noinst_PROGRAMS =