[PATCH 3/3] [mama] C++ Makefile fixes


Ian Bell <IBell@...>
 

From cba7a223479aba180b9ea9d109492b323c4ea389 Mon Sep 17 00:00:00 2001

Message-Id: <cba7a223479aba180b9ea9d109492b323c4ea389.1348734020.git.ibell@...>

In-Reply-To: <332a4a960eb7292e9545e9f2856f1212848cfd8b.1348734020.git.ibell@...>

References: <332a4a960eb7292e9545e9f2856f1212848cfd8b.1348734020.git.ibell@...>

From: Ian Bell <ibell@...>

Date: Thu, 27 Sep 2012 09:19:19 +0100

Subject: [PATCH 3/3] [mama] C++ Makefile fixes

 

Tighened up makefile options and fixed same ple makefile.  Also fixed a

warning in the ftmember example.

 

Signed-off-by: Ian Bell <ibell@...>

---

mama/c_cpp/src/examples/cpp/Makefile.am         |    4 ++--

mama/c_cpp/src/examples/cpp/Makefile.sample     |    2 +-

mama/c_cpp/src/examples/cpp/mamaftmembercpp.cpp |    2 +-

3 files changed, 4 insertions(+), 4 deletions(-)

 

diff --git a/mama/c_cpp/src/examples/cpp/Makefile.am b/mama/c_cpp/src/examples/cpp/Makefile.am

index 6d617cf..0613185 100644

--- a/mama/c_cpp/src/examples/cpp/Makefile.am

+++ b/mama/c_cpp/src/examples/cpp/Makefile.am

@@ -31,8 +31,8 @@ CPPFLAGS   += -I$(srcdir)/../../c \

 

 if USE_GCC_FLAGS

-CFLAGS   += -Wmissing-prototypes -Wstrict-prototypes

-CPPFLAGS += -pedantic -Wall -Wimplicit -Wno-long-long -D_GNU_SOURCE

+CFLAGS   += -std=gnu99 -pedantic-errors -Wmissing-prototypes -Wstrict-prototypes

+CPPFLAGS += -pedantic-errors -Wall -Wimplicit -Wno-long-long -D_GNU_SOURCE

endif

 LDFLAGS  += -L${srcdir}/../../cpp \

diff --git a/mama/c_cpp/src/examples/cpp/Makefile.sample b/mama/c_cpp/src/examples/cpp/Makefile.sample

index ab5e7cd..28ab530 100644

--- a/mama/c_cpp/src/examples/cpp/Makefile.sample

+++ b/mama/c_cpp/src/examples/cpp/Makefile.sample

@@ -60,7 +60,7 @@ LDFLAGS      = -rdynamic \

 

 MAMA_LIBS    = $(BDYNAMIC) -lmama \

-               $(BDYNAMIC) $($(API_PLATFORM)_libs) -lrt -lpthread -lm

+               $(BDYNAMIC) $($(API_PLATFORM)_libs) -lrt -lpthread -lm -ldl -lpthread

MAMACPP_LIBS = $(BSTATIC) -lmamacpp $(BDYNAMIC) $(MAMA_LIBS)

 

 # Targets:

diff --git a/mama/c_cpp/src/examples/cpp/mamaftmembercpp.cpp b/mama/c_cpp/src/examples/cpp/mamaftmembercpp.cpp

index 656e33a..683c5b9 100644

--- a/mama/c_cpp/src/examples/cpp/mamaftmembercpp.cpp

+++ b/mama/c_cpp/src/examples/cpp/mamaftmembercpp.cpp

@@ -29,7 +29,7 @@

using namespace Wombat;

using namespace std;

-static  char* gUsageString[]=

+static const char* gUsageString[]=

{

     "MamaFtMember - Simple fault tolerance example.",

     "Demonstrates use of the MAMA FT API.",

--

1.7.9.5

 




Please consider the environment before printing this e-mail.

This e-mail may contain confidential and/or privileged information. If you are not the intended recipient or have received this e-mail in error, please advise the sender immediately by reply e-mail and delete this message and any attachments without retaining a copy.

Any unauthorised copying, disclosure or distribution of the material in this e-mail is strictly forbidden.