[Cluster-devel] cluster Makefile configure

[teigland at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland at sourceware.org	2007-02-27 20:17:15

Modified files:
	.              : Makefile configure 

Log message:
	un-comment-out gfs-kernel and gnbd-kernel since they now build on
	upstream kernel

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/Makefile.diff?cvsroot=cluster&r1=1.24&r2=1.25
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.20&r2=1.21

--- cluster/Makefile	2006/10/05 16:28:07	1.24
+++ cluster/Makefile	2007/02/27 20:17:15	1.25
@@ -16,14 +16,14 @@
 
 
 all:
-#	${MAKE} -C gnbd-kernel all
+	${MAKE} -C gnbd-kernel all
 	${MAKE} -C cman/lib all
 	${MAKE} -C ccs all
 	${MAKE} -C cman all
 	${MAKE} -C group all
 	${MAKE} -C dlm all
 	${MAKE} -C fence all
-#	${MAKE} -C gfs-kernel all
+	${MAKE} -C gfs-kernel all
 	${MAKE} -C gfs all
 	${MAKE} -C gfs2 all
 	${MAKE} -C gnbd all
@@ -33,8 +33,8 @@
 clean:
 	rm -f *tar.gz
 	rm -rf build
-#	${MAKE} -C gfs-kernel clean
-#	${MAKE} -C gnbd-kernel clean
+	${MAKE} -C gfs-kernel clean
+	${MAKE} -C gnbd-kernel clean
 	${MAKE} -C ccs clean
 	${MAKE} -C cman clean
 	${MAKE} -C group clean
@@ -47,8 +47,8 @@
 #	${MAKE} -C cmirror clean
 
 distclean:
-#	${MAKE} -C gfs-kernel distclean
-#	${MAKE} -C gnbd-kernel distclean
+	${MAKE} -C gfs-kernel distclean
+	${MAKE} -C gnbd-kernel distclean
 	${MAKE} -C ccs distclean
 	${MAKE} -C cman distclean
 	${MAKE} -C group distclean
@@ -61,8 +61,8 @@
 #	${MAKE} -C cmirror distclean
 
 install: all
-#	${MAKE} -C gfs-kernel install
-#	${MAKE} -C gnbd-kernel install
+	${MAKE} -C gfs-kernel install
+	${MAKE} -C gnbd-kernel install
 	${MAKE} -C ccs install
 	${MAKE} -C cman install
 	${MAKE} -C group install
@@ -75,8 +75,8 @@
 #	${MAKE} -C cmirror install
 
 uninstall:
-#	${MAKE} -C gfs-kernel uninstall
-#	${MAKE} -C gnbd-kernel uninstall
+	${MAKE} -C gfs-kernel uninstall
+	${MAKE} -C gnbd-kernel uninstall
 	${MAKE} -C ccs uninstall
 	${MAKE} -C cman uninstall
 	${MAKE} -C group uninstall
@@ -89,8 +89,8 @@
 #	${MAKE} -C cmirror uninstall
 
 latest_tags:
-#	${LATEST_TAG} gfs-kernel
-#	${LATEST_TAG} gnbd-kernel
+	${LATEST_TAG} gfs-kernel
+	${LATEST_TAG} gnbd-kernel
 	${LATEST_TAG} ccs
 	${LATEST_TAG} cman
 	${LATEST_TAG} dlm
@@ -111,8 +111,8 @@
 	$(BUILD_SRPMS)
 
 tarballs: TAG
-#	make -s COMPONENT=gfs-kernel RELEASE_FILE=gfs-kernel/make/release.mk.input tarball
-#	make -s COMPONENT=gnbd-kernel RELEASE_FILE=gnbd-kernel/make/release.mk.input tarball
+	make -s COMPONENT=gfs-kernel RELEASE_FILE=gfs-kernel/make/release.mk.input tarball
+	make -s COMPONENT=gnbd-kernel RELEASE_FILE=gnbd-kernel/make/release.mk.input tarball
 	make -s COMPONENT=ccs RELEASE_FILE=ccs/make/release.mk.input tarball
 	make -s COMPONENT=cman RELEASE_FILE=cman/make/release.mk.input tarball
 	make -s COMPONENT=dlm RELEASE_FILE=dlm/make/release.mk.input tarball
--- cluster/configure	2006/10/05 16:50:57	1.20
+++ cluster/configure	2007/02/27 20:17:15	1.21
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# echo "configure gnbd-kernel"
-# (cd gnbd-kernel; ./configure $@)
+echo "configure gnbd-kernel"
+(cd gnbd-kernel; ./configure $@)
 
 echo "configure ccs"
 (cd ccs; ./configure $@)
@@ -18,8 +18,8 @@
 echo "configure fence"
 (cd fence; ./configure $@ -ccslibdir=`pwd`/../ccs/lib --ccsincdir=`pwd`/../ccs/lib --cmanincdir=`pwd`/../cman/lib)
 
-#echo "configure gfs-kernel"
-#(cd gfs-kernel; ./configure $@ --dlmkincdir=`pwd`/../dlm-kernel/src2)
+echo "configure gfs-kernel"
+(cd gfs-kernel; ./configure $@ --dlmkincdir=`pwd`/../dlm-kernel/src2)
 
 echo "configure gfs"
 (cd gfs; ./configure $@ --gfskincdir=`pwd`/../gfs-kernel/src/gfs)