From 96f0ea876c43e27f628c68dca155ce2f5b82fa09 Mon Sep 17 00:00:00 2001
Message-Id: <96f0ea876c43e27f628c68dca155ce2f5b82fa09.1348836736.git.ibell@...>
From: Ian Bell <ibell@...>
Date: Fri, 28 Sep 2012 10:54:34 +0100
Subject: [PATCH 1/5] [testtools] Makefile fixes
Tighened up makefile options
Signed-off-by: Ian Bell <ibell@...>
---
mama/c_cpp/src/gunittest/c/Makefile.am | 2 +-
.../src/testtools/capturereplay/c/Makefile.am | 4 ++--
mama/c_cpp/src/testtools/load/c/Makefile.am | 4 ++--
mama/c_cpp/src/testtools/load/cpp/Makefile.am | 4 ++--
mama/c_cpp/src/testtools/performance/c/Makefile.am | 2 +-
.../src/testtools/performance/cpp/Makefile.am | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/mama/c_cpp/src/gunittest/c/Makefile.am b/mama/c_cpp/src/gunittest/c/Makefile.am
index 0ff852a..3341b0a 100644
--- a/mama/c_cpp/src/gunittest/c/Makefile.am
+++ b/mama/c_cpp/src/gunittest/c/Makefile.am
@@ -41,7 +41,7 @@ LDFLAGS += -L${srcdir}/../../c \
LIBS = -lmama -lwombatcommon -lgtest
LDADD = -lgtest_main -ldl
-bin_PROGRAMS = MainUnitTestC
+bin_PROGRAMS = UnitTestMamaC
nodist_UnitTestMamaC_SOURCES = MainUnitTestC.cpp \
msgtests.cpp \
diff --git a/mama/c_cpp/src/testtools/capturereplay/c/Makefile.am b/mama/c_cpp/src/testtools/capturereplay/c/Makefile.am
index 97b0aed..be581c1 100644
--- a/mama/c_cpp/src/testtools/capturereplay/c/Makefile.am
+++ b/mama/c_cpp/src/testtools/capturereplay/c/Makefile.am
@@ -33,8 +33,8 @@ LDFLAGS += -L${srcdir}/../../../c/ \
-L$(srcdir)/../../../../../../common/c_cpp/src/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
LDADD = -lmama -lpthread -lm -lwombatcommon -ldl
diff --git a/mama/c_cpp/src/testtools/load/c/Makefile.am b/mama/c_cpp/src/testtools/load/c/Makefile.am
index 69091ce..2519325 100755
--- a/mama/c_cpp/src/testtools/load/c/Makefile.am
+++ b/mama/c_cpp/src/testtools/load/c/Makefile.am
@@ -32,8 +32,8 @@ LDFLAGS += -L${srcdir}/../../../c \
-L${srcdir}/../../../../../../common/c_cpp/src/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
LDADD = -lmama -lpthread -lm -lwombatcommon -ldl
diff --git a/mama/c_cpp/src/testtools/load/cpp/Makefile.am b/mama/c_cpp/src/testtools/load/cpp/Makefile.am
index e25ec84..07b38a8 100755
--- a/mama/c_cpp/src/testtools/load/cpp/Makefile.am
+++ b/mama/c_cpp/src/testtools/load/cpp/Makefile.am
@@ -42,8 +42,8 @@ LDFLAGS += -L${srcdir}/../../../c \
-L${srcdir}/../..
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
CFLAGS += -I@builddir@/../../c
diff --git a/mama/c_cpp/src/testtools/performance/c/Makefile.am b/mama/c_cpp/src/testtools/performance/c/Makefile.am
index 4be42d5..f698e22 100644
--- a/mama/c_cpp/src/testtools/performance/c/Makefile.am
+++ b/mama/c_cpp/src/testtools/performance/c/Makefile.am
@@ -32,7 +32,7 @@ LDFLAGS += -L${srcdir}/../../../c \
-L${srcdir}/../../../../../../common/c_cpp/src/c
if USE_GCC_FLAGS
-CFLAGS += -Wmissing-prototypes -Wstrict-prototypes
+CFLAGS += -std=gnu99 -pedantic -Wmissing-prototypes -Wstrict-prototypes
CPPFLAGS += -pedantic -Wall -Wimplicit -Wno-long-long -D_GNU_SOURCE
endif
diff --git a/mama/c_cpp/src/testtools/performance/cpp/Makefile.am b/mama/c_cpp/src/testtools/performance/cpp/Makefile.am
index 8b1dd97..9dd8963 100644
--- a/mama/c_cpp/src/testtools/performance/cpp/Makefile.am
+++ b/mama/c_cpp/src/testtools/performance/cpp/Makefile.am
@@ -37,8 +37,8 @@ LDFLAGS += -L${srcdir}/../../../c \
-L${srcdir}/../../../../../../common/c_cpp/src/cpp
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
CFLAGS += -I@builddir@/../../c
--
1.7.9.5
