[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.03-18-g3357e69

[fabbione at sourceware.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=3357e69e113feda28abad93f693d43c970f96027

The branch, master has been updated
       via  3357e69e113feda28abad93f693d43c970f96027 (commit)
      from  1d3b1407b0584ef097713b7619768a9389bc7873 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3357e69e113feda28abad93f693d43c970f96027
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
Date:   Mon Jun 9 07:03:58 2008 +0200

    [GNBD/FENCE] Move fence_gnbd agent where it belongs
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 .../fence_gnbd => fence/agents/gnbd}/Makefile      |    3 +--
 .../tools/fence_gnbd => fence/agents/gnbd}/main.c  |    0 
 fence/man/Makefile                                 |    1 +
 {gnbd => fence}/man/fence_gnbd.8                   |    0 
 gnbd/man/Makefile                                  |    3 +--
 gnbd/tools/Makefile                                |    2 +-
 6 files changed, 4 insertions(+), 5 deletions(-)
 rename {gnbd/tools/fence_gnbd => fence/agents/gnbd}/Makefile (86%)
 rename {gnbd/tools/fence_gnbd => fence/agents/gnbd}/main.c (100%)
 rename {gnbd => fence}/man/fence_gnbd.8 (100%)

diff --git a/gnbd/tools/fence_gnbd/Makefile b/fence/agents/gnbd/Makefile
similarity index 86%
rename from gnbd/tools/fence_gnbd/Makefile
rename to fence/agents/gnbd/Makefile
index 51b145b..054240a 100644
--- a/gnbd/tools/fence_gnbd/Makefile
+++ b/fence/agents/gnbd/Makefile
@@ -12,10 +12,9 @@ include $(OBJDIR)/make/uninstall.mk
 
 OBJS= main.o
 
-CFLAGS += -I$(S)/../../include -I$(S)/../gnbd_import
+CFLAGS += -I$(SRCDIR)/gnbd/tools/gnbd_import
 CFLAGS += -I${incdir}
 
-
 ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
diff --git a/gnbd/tools/fence_gnbd/main.c b/fence/agents/gnbd/main.c
similarity index 100%
rename from gnbd/tools/fence_gnbd/main.c
rename to fence/agents/gnbd/main.c
diff --git a/fence/man/Makefile b/fence/man/Makefile
index 824d520..97c8be8 100644
--- a/fence/man/Makefile
+++ b/fence/man/Makefile
@@ -6,6 +6,7 @@ TARGET= fence.8 \
 	fence_brocade.8 \
 	fence_drac.8 \
 	fence_egenera.8 \
+	fence_gnbd.8 \
 	fence_ifmib.8 \
 	fence_ilo.8 \
 	fence_manual.8 \
diff --git a/gnbd/man/fence_gnbd.8 b/fence/man/fence_gnbd.8
similarity index 100%
rename from gnbd/man/fence_gnbd.8
rename to fence/man/fence_gnbd.8
diff --git a/gnbd/man/Makefile b/gnbd/man/Makefile
index 7b869c4..e8c7818 100644
--- a/gnbd/man/Makefile
+++ b/gnbd/man/Makefile
@@ -1,8 +1,7 @@
 TARGET= gnbd.8 \
 	gnbd_export.8 \
 	gnbd_import.8 \
-	gnbd_serv.8 \
-	fence_gnbd.8
+	gnbd_serv.8
 
 include ../../make/defines.mk
 include $(OBJDIR)/make/man.mk
diff --git a/gnbd/tools/Makefile b/gnbd/tools/Makefile
index df9274d..f5b0675 100644
--- a/gnbd/tools/Makefile
+++ b/gnbd/tools/Makefile
@@ -1,4 +1,4 @@
 include ../../make/defines.mk
 include $(OBJDIR)/make/passthrough.mk
 
-SUBDIRS=fence_gnbd gnbd_export gnbd_import
+SUBDIRS=gnbd_export gnbd_import


hooks/post-receive
--
Cluster Project