fence-agents: master - fence_rackswitch: Add metadata generation for C-based fence agents

Marek GrĂ¡c marx at fedoraproject.org
Fri Dec 9 09:07:07 UTC 2011


Gitweb:        http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commitdiff;h=9df455796b3a1298ec2f47935847d6e195b51058
Commit:        9df455796b3a1298ec2f47935847d6e195b51058
Parent:        68fad86de38494cd0927174da0a62732e89be1ff
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Fri Dec 9 10:05:31 2011 +0100
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Fri Dec 9 10:05:31 2011 +0100

fence_rackswitch: Add metadata generation for C-based fence agents

This should be part of previous patch: fence_rackswitch: Add metadata output for fence_rackswitch agent

Resolves: rhbz#714841 (partial)
---
 fence/agents/ipmilan/Makefile.am    |   15 +++++++--------
 fence/agents/rackswitch/Makefile.am |    9 +++------
 make/fencemanc.mk                   |    2 +-
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/fence/agents/ipmilan/Makefile.am b/fence/agents/ipmilan/Makefile.am
index 4868dc6..f237f92 100644
--- a/fence/agents/ipmilan/Makefile.am
+++ b/fence/agents/ipmilan/Makefile.am
@@ -1,17 +1,16 @@
 MAINTAINERCLEANFILES	= Makefile.in
 
-sbin_PROGRAMS		= fence_ipmilan
+TARGET			= fence_ipmilan
+
+sbin_PROGRAMS		= $(TARGET)
 
 noinst_HEADERS		= expect.h
 
 fence_ipmilan_SOURCES	= expect.c ipmilan.c
 
-man_MANS		= fence_ipmilan.8
+dist_man_MANS		= $(TARGET).8
 
-fence_ipmilan.8: fence_ipmilan $(top_srcdir)/fence/agents/lib/fence2man.xsl
-	set -e && \
-	./$^ -o metadata > .$@.tmp && \
-	xsltproc $(top_srcdir)/fence/agents/lib/fence2man.xsl .$@.tmp > $@
+include $(top_srcdir)/make/fencemanc.mk
 
-clean-local:
-	rm -f *.8 .*.8.tmp
+clean-local: clean-man
+	rm -f $(TARGET)
diff --git a/fence/agents/rackswitch/Makefile.am b/fence/agents/rackswitch/Makefile.am
index b6369e4..d2c9e1f 100644
--- a/fence/agents/rackswitch/Makefile.am
+++ b/fence/agents/rackswitch/Makefile.am
@@ -10,10 +10,7 @@ fence_rackswitch_SOURCES = do_rack.c
 
 dist_man_MANS		 = $(TARGET).8
 
-fence_rackswitch.8: fence_rackswitch $(top_srcdir)/fence/agents/lib/fence2man.xsl
-	set -e && \
-	./$^ -o metadata > .$@.tmp && \
-	xsltproc $(top_srcdir)/fence/agents/lib/fence2man.xsl .$@.tmp > $@
+include $(top_srcdir)/make/fencemanc.mk
 
-clean-local:
-	rm -f *.8 .*.8.tmp
\ No newline at end of file
+clean-local: clean-man
+	rm -f $(TARGET)
\ No newline at end of file
diff --git a/make/fencemanc.mk b/make/fencemanc.mk
index 70ee773..9c904b6 100644
--- a/make/fencemanc.mk
+++ b/make/fencemanc.mk
@@ -1,6 +1,6 @@
 %.8: $(TARGET) $(top_srcdir)/fence/agents/lib/fence2man.xsl
 	set -e && \
-		./$(TARGET) -o metadata > .$@.tmp && \
+		./$^ -o metadata > .$@.tmp && \
 	xsltproc $(top_srcdir)/fence/agents/lib/fence2man.xsl .$@.tmp > $@
 
 clean-man:


More information about the cluster-commits mailing list