This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
STABLE2 - build: respect EXTRA_CFLAGS across the whole tree
- From: "Fabio M. Di Nitto" <fabbione at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Mon, 10 Nov 2008 18:06:56 +0000 (UTC)
- Subject: STABLE2 - build: respect EXTRA_CFLAGS across the whole tree
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=73dd815c96248718d57f874d36d50aa146b32daa
Commit: 73dd815c96248718d57f874d36d50aa146b32daa
Parent: f492fd5175370f3e1656ba501b0f6701295baaba
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate: Mon Nov 10 19:06:25 2008 +0100
Committer: Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Mon Nov 10 19:06:25 2008 +0100
build: respect EXTRA_CFLAGS across the whole tree
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
fence/agents/xvm/Makefile | 2 +-
make/cobj.mk | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fence/agents/xvm/Makefile b/fence/agents/xvm/Makefile
index 67abeec..2674650 100644
--- a/fence/agents/xvm/Makefile
+++ b/fence/agents/xvm/Makefile
@@ -36,7 +36,7 @@ CFLAGS += -I${virtincdir} -I${nssincdir} -I${nsprincdir}
CFLAGS += `xml2-config --cflags`
CFLAGS += -I${incdir}
-EXTRA_CFLAGS += -DSTANDALONE
+STANDALONE_CFLAGS += -DSTANDALONE
LDFLAGS += -L${nsslibdir} -L${libdir}
LDFLAGS += -lnss3
diff --git a/make/cobj.mk b/make/cobj.mk
index ba17ecf..46b762f 100644
--- a/make/cobj.mk
+++ b/make/cobj.mk
@@ -1,10 +1,10 @@
%.o: $(S)/%.c
- $(CC) $(CFLAGS) -c -o $@ $<
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
# used by rgmanager/src/daemons
%-noccs.o: $(S)/%.c
- $(CC) $(CFLAGS) $(NOCCS_CFLAGS) -c -o $@ $<
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(NOCCS_CFLAGS) -c -o $@ $<
# used by fence/agents/xvm
%-standalone.o: $(S)/%.c
- $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(STANDALONE_CFLAGS) -c -o $@ $<