From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 7 Sep 2007 19:49:29 -0000
Subject: [Cluster-devel] conga luci/make/defines.mk.in ricci/include/St ...
Message-ID: <20070907194929.29457.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

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`