From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga luci/make/defines.mk.in ricci/include/St ...
Date: 7 Sep 2007 19:49:29 -0000 [thread overview]
Message-ID: <20070907194929.29457.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-09-07 19:49:29
Modified files:
luci/make : defines.mk.in
ricci/include : String.h
ricci/make : defines.mk.in
Log message:
More makefile tweaks that got missed in the last commit
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/make/defines.mk.in.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/String.h.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/make/defines.mk.in.diff?cvsroot=cluster&r1=1.6&r2=1.7
--- conga/luci/make/defines.mk.in 2006/07/24 20:17:02 1.1
+++ conga/luci/make/defines.mk.in 2007/09/07 19:49:29 1.2
@@ -34,6 +34,8 @@
CXXFLAGS += -Wall -Wno-unused -fPIC -g ${INCLUDE}
LDFLAGS += -fPIC
+PARANOID=0
+
CC = gcc
CXX = g++
LD = g++
--- conga/ricci/include/String.h 2007/09/07 19:07:22 1.3
+++ conga/ricci/include/String.h 2007/09/07 19:49:29 1.4
@@ -5,7 +5,7 @@
#include "shred_allocator.h"
-#if PARANOIA > 0
+#if defined(PARANOIA) && PARANOIA > 0
typedef std::basic_string<char,
std::char_traits<char>,
--- conga/ricci/make/defines.mk.in 2006/08/22 23:01:17 1.6
+++ conga/ricci/make/defines.mk.in 2007/09/07 19:49:29 1.7
@@ -32,7 +32,7 @@
INSTALL_BIN = install
INSTALL_LIB = install
-
+PARANOID=0
PEGASUS_PLATFORM ?= @@PEGASUS_PLATFORM@@
INCLUDE += -I $(top_srcdir)/include \
@@ -40,7 +40,7 @@
`pkg-config --cflags openssl`
CFLAGS += -Wall -Wno-unused -fPIC -g ${INCLUDE}
CXXFLAGS += -Wall -Wno-unused -fPIC -g ${INCLUDE}
-LDFLAGS += -fPIC -lpthread ${top_srcdir}/common/*.o \
+LDFLAGS += -fPIC -lpthread \
`pkg-config --libs libxml-2.0` \
`pkg-config --libs openssl`
reply other threads:[~2007-09-07 19:49 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070907194929.29457.qmail@sourceware.org \
--to=rmccabe@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).