Fix rgmanager -DNO_CCS build

PATCH New Lon Hohberger 1 participant 1 message Nov 10, 2008

Share & tools

Lon Hohberger

author

2008-11-10 17:03 UTC #0 lore raw

PATCH 1/1 Fix rgmanager -DNO_CCS build

Rgmanager is being built with -DNO_CCS, which would cause all sorts of problems. Some files will be reading from libccs while others would do things by reading from libxml2 (e.g. -DNO_CCS) directly. During configuration, this could cause a number problems.

This patch fixes the build, but as it is alters part of the build system, I will not commit it.

-- Lon

make/cobj.mk +1 -1

index b484f6b..a009927 100644
@@ -7,7 +7,7 @@
 
 # used by rgmanager/src/daemons
 %-noccs.o: $(S)/%.c
-	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) $(NOCCS_CFLAGS) -c -o $@ $<
 
 # used by fence/agents/xvm
 %-standalone.o: $(S)/%.c

(quoted diff) +0 -0

b/rgmanager/src/daemons/Makefile
index df07aab..22d55b0 100644

rgmanager/src/daemons/Makefile +1 -2

@@ -53,7 +53,7 @@ CFLAGS += `xml2-config --cflags` -I${readlineincdir}
-I${slangincdir}
 CFLAGS += -I$(S)/../../include
 CFLAGS += -I${incdir}
 
-EXTRA_CFLAGS += -DNO_CCS
+NOCCS_CFLAGS += -DNO_CCS
 
 LDFLAGS += -L../clulib -lclulib

LDFLAGS += -L${libdir}