[PATCH 5/6] [mamda] Makefile changes


Ian Bell <IBell@...>
 

From 8991e05dcf6594313fc6dde741f516d7cdf42ede Mon Sep 17 00:00:00 2001

Message-Id: <8991e05dcf6594313fc6dde741f516d7cdf42ede.1348824474.git.ibell@...>

In-Reply-To: <766019e29e6ff6072c662caa2de6adbd3e9df875.1348824474.git.ibell@...>

References: <766019e29e6ff6072c662caa2de6adbd3e9df875.1348824474.git.ibell@...>

From: Ian Bell <ibell@...>

Date: Fri, 28 Sep 2012 10:25:15 +0100

Subject: [PATCH 5/6] [mamda] Makefile changes

 

Tighened up makefile options

 

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

---

mamda/c_cpp/doc/footer.html                |    7 +++++++

mamda/c_cpp/src/cpp/Makefile.am            |    2 +-

mamda/c_cpp/src/cpp/news/Makefile.am       |    4 ++--

mamda/c_cpp/src/cpp/options/Makefile.am    |    4 ++--

mamda/c_cpp/src/cpp/orderbooks/Makefile.am |    4 ++--

mamda/c_cpp/src/examples/Makefile.sample   |    2 +-

6 files changed, 15 insertions(+), 8 deletions(-)

 

diff --git a/mamda/c_cpp/doc/footer.html b/mamda/c_cpp/doc/footer.html

index 308b1d0..e04e991 100644

--- a/mamda/c_cpp/doc/footer.html

+++ b/mamda/c_cpp/doc/footer.html

@@ -1,2 +1,9 @@

+<div style="width:100%">

+    <div align="center" style="align:center;">

+        <br/>

+        <br/>

+        <span>&copy; 2012 Linux Foundation</span>

+    </div>

+</div>

</body>

</html>

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

index d7eab76..1c191b4 100644

--- a/mamda/c_cpp/src/cpp/Makefile.am

+++ b/mamda/c_cpp/src/cpp/Makefile.am

@@ -119,7 +119,7 @@ CPPFLAGS += -I$(srcdir)/.. \

             -I$(srcdir)/../../../../common/c_cpp/src/c

 

 if USE_GCC_FLAGS

-CPPFLAGS += -pedantic -Wall -Wno-long-long -Wno-non-virtual-dtor -D_GNU_SOURCE

+CPPFLAGS += -pedantic-errors -Wall -Wno-long-long -Wno-non-virtual-dtor -D_GNU_SOURCE

endif

 libmamda_la_SOURCES = \

diff --git a/mamda/c_cpp/src/cpp/news/Makefile.am b/mamda/c_cpp/src/cpp/news/Makefile.am

index f580fdb..85a1f45 100644

--- a/mamda/c_cpp/src/cpp/news/Makefile.am

+++ b/mamda/c_cpp/src/cpp/news/Makefile.am

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

             -I$(srcdir)/../../../../../common/c_cpp/src/c

 

 if USE_GCC_FLAGS

-CFLAGS += -pedantic -Wno-long-long -Wall

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

+CFLAGS += -pedantic-errors -Wno-long-long -Wall

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

endif

 libmamdanews_la_SOURCES = \

diff --git a/mamda/c_cpp/src/cpp/options/Makefile.am b/mamda/c_cpp/src/cpp/options/Makefile.am

index c40f7e2..65bc418 100644

--- a/mamda/c_cpp/src/cpp/options/Makefile.am

+++ b/mamda/c_cpp/src/cpp/options/Makefile.am

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

             -I$(srcdir)/../../../../../common/c_cpp/src/c

 

 if USE_GCC_FLAGS

-CFLAGS += -pedantic -Wno-long-long -Wall

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

+CFLAGS += -pedantic-errors -Wno-long-long -Wall

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

endif

 

diff --git a/mamda/c_cpp/src/cpp/orderbooks/Makefile.am b/mamda/c_cpp/src/cpp/orderbooks/Makefile.am

index 252a7da..85b47bd 100644

--- a/mamda/c_cpp/src/cpp/orderbooks/Makefile.am

+++ b/mamda/c_cpp/src/cpp/orderbooks/Makefile.am

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

             -I$(srcdir)/../../../../../common/c_cpp/src/c

 

 if USE_GCC_FLAGS

-CFLAGS += -pedantic -Wall -Wno-long-long

-CPPFLAGS += -pedantic -Wall -Wno-long-long -Wno-non-virtual-dtor

+CFLAGS += -pedantic-errors -Wall -Wno-long-long

+CPPFLAGS += -pedantic-errors -Wall -Wno-long-long -Wno-non-virtual-dtor

endif

 libmamdabook_la_SOURCES = \

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

index e434efa..997c741 100644

--- a/mamda/c_cpp/src/examples/Makefile.sample

+++ b/mamda/c_cpp/src/examples/Makefile.sample

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

 MAMDA_LIBS   = $(BSTATIC) -lmamda $(BDYNAMIC)

MAMA_LIBS    = $(BSTATIC) -lmamacpp -lmama -lwombatmsg -lwcache \

-               $(BDYNAMIC) $($(API_PLATFORM)_libs) -lrt -ldl -lpthread -lwombatcommon

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

               

     

 COMMON_LIBS  = $(MAMDA_LIBS) $(MAMA_LIBS) $(SYS_LIBS)

--

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.