CVSROOT: /cvs/cluster
Module name: cluster
Changes by: fabbione@sourceware.org 2007-12-22 13:45:30

Modified files:
fence/fence_node: Makefile
fence/fence_tool: Makefile

Log message:
Fix fence build dependencies. For too long we did rely on fence/Makefile
to build in the right order but fence_tool and fence_node were just broken.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_node/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_tool/Makefile.diff?cvsroot=cluster&r1=1.22&r2=1.23

--- cluster/fence/fence_node/Makefile 2007/12/22 13:36:52 1.15
+++ cluster/fence/fence_node/Makefile 2007/12/22 13:45:30 1.16
@@ -15,7 +15,7 @@

SBINDIRT=$(TARGET)

-all: ${TARGET}
+all: depends ${TARGET}

include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
@@ -34,8 +34,10 @@

LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman

-
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

+depends:
+ $(MAKE) -C ../fenced agent.o
+
clean: generalclean
--- cluster/fence/fence_tool/Makefile 2007/12/22 13:36:52 1.22
+++ cluster/fence/fence_tool/Makefile 2007/12/22 13:45:30 1.23
@@ -15,7 +15,7 @@

SBINDIRT=$(TARGET)

-all: ${TARGET}
+all: depends ${TARGET}

include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
@@ -34,8 +34,10 @@
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
LDFLAGS += -L../../group/lib -lgroup

-
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

+depends:
+ $(MAKE) -C ../fenced agent.o
+
clean: generalclean