From mboxrd@z Thu Jan 1 00:00:00 1970 From: fabbione@sourceware.org Date: 21 Dec 2007 09:11:24 -0000 Subject: [Cluster-devel] cluster ccs/Makefile cman/Makefile dlm/tests/M ... Message-ID: <20071221091124.24242.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: cluster Changes by: fabbione at sourceware.org 2007-12-21 09:11:17 Modified files: ccs : Makefile cman : Makefile dlm/tests : Makefile dlm : Makefile fence/agents : Makefile fence : Makefile gfs/tests : Makefile gfs : Makefile gfs2 : Makefile gnbd : Makefile gnbd/tools : Makefile group : Makefile rgmanager : Makefile rgmanager/src : Makefile fence/agents/bladecenter: Makefile fence/agents/ilo: Makefile fence/agents/xcat: Makefile fence/agents/ibmblade: Makefile fence/agents/mcdata: Makefile fence/agents/cpint: Makefile fence/agents/bullpap: Makefile fence/agents/vixel: Makefile fence/agents/zvm: Makefile fence/agents/drac: Makefile fence/agents/sanbox2: Makefile fence/agents/baytech: Makefile fence/agents/vmware: Makefile fence/agents/brocade: Makefile fence/agents/wti: Makefile fence/agents/egenera: Makefile fence/agents/rsb: Makefile fence/agents/rsa: Makefile fence/agents/apc: Makefile Log message: Use newly defined $(OBJDIR) to source .mk files snippet. This reduced the hardcoded paths in Makefiles to one to include defines.mk and makes it easier to change stuff across the tree in one shot. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tests/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/tests/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/bladecenter/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ilo/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xcat/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ibmblade/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/mcdata/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/cpint/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/bullpap/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/vixel/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/zvm/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/drac/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/sanbox2/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/baytech/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/vmware/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/brocade/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/wti/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/egenera/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rsb/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rsa/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/apc/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8 --- cluster/ccs/Makefile 2007/08/29 03:09:53 1.13 +++ cluster/ccs/Makefile 2007/12/21 09:11:13 1.14 @@ -11,6 +11,6 @@ ############################################################################### include ../make/defines.mk -include ../make/passthrough.mk +include $(OBJDIR)/make/passthrough.mk SUBDIRS=lib daemon ccs_test ccs_tool man --- cluster/cman/Makefile 2007/08/29 03:09:53 1.12 +++ cluster/cman/Makefile 2007/12/21 09:11:13 1.13 @@ -12,6 +12,6 @@ ############################################################################### include ../make/defines.mk -include ../make/passthrough.mk +include $(OBJDIR)/make/passthrough.mk SUBDIRS=lib cman_tool daemon qdisk init.d man --- cluster/dlm/tests/Makefile 2007/08/29 03:09:54 1.2 +++ cluster/dlm/tests/Makefile 2007/12/21 09:11:13 1.3 @@ -11,6 +11,6 @@ ############################################################################### include ../../make/defines.mk -include ../../make/passthrough.mk +include $(OBJDIR)/make/passthrough.mk SUBDIRS=usertest --- cluster/dlm/Makefile 2007/08/29 03:09:53 1.11 +++ cluster/dlm/Makefile 2007/12/21 09:11:14 1.12 @@ -11,6 +11,6 @@ ############################################################################### include ../make/defines.mk -include ../make/passthrough.mk +include $(OBJDIR)/make/passthrough.mk SUBDIRS=lib tool man --- cluster/fence/agents/Makefile 2007/08/29 03:09:54 1.18 +++ cluster/fence/agents/Makefile 2007/12/21 09:11:14 1.19 @@ -12,7 +12,7 @@ ############################################################################### include ../../make/defines.mk -include ../../make/passthrough.mk +include $(OBJDIR)/make/passthrough.mk SUBDIRS = ${fence_agents} --- cluster/fence/Makefile 2007/12/20 22:09:58 1.10 +++ cluster/fence/Makefile 2007/12/21 09:11:14 1.11 @@ -12,6 +12,6 @@ ############################################################################### include ../make/defines.mk -include ../make/passthrough.mk +include $(OBJDIR)/make/passthrough.mk SUBDIRS=agents fenced fence_node fence_tool man --- cluster/gfs/tests/Makefile 2007/08/29 03:09:54 1.2 +++ cluster/gfs/tests/Makefile 2007/12/21 09:11:14 1.3 @@ -11,6 +11,6 @@ ############################################################################### include ../make/defines.mk -include ../make/passthrough.mk +include $(OBJDIR)/make/passthrough.mk SUBDIRS=filecon2 mmdd --- cluster/gfs/Makefile 2007/11/14 12:33:45 1.13 +++ cluster/gfs/Makefile 2007/12/21 09:11:14 1.14 @@ -12,7 +12,7 @@ ############################################################################### include ../make/defines.mk -include ../make/passthrough.mk +include $(OBJDIR)/make/passthrough.mk SUBDIRS=libgfs gfs_debug gfs_edit gfs_fsck gfs_grow gfs_jadd gfs_mkfs gfs_quota gfs_tool man init.d --- cluster/gfs2/Makefile 2007/08/29 03:09:54 1.11 +++ cluster/gfs2/Makefile 2007/12/21 09:11:14 1.12 @@ -12,6 +12,6 @@ ############################################################################### include ../make/defines.mk -include ../make/passthrough.mk +include $(OBJDIR)/make/passthrough.mk SUBDIRS=libgfs2 convert edit fsck mkfs mount quota tool man init.d --- cluster/gnbd/Makefile 2007/08/29 03:09:54 1.5 +++ cluster/gnbd/Makefile 2007/12/21 09:11:14 1.6 @@ -12,6 +12,6 @@ ############################################################################### include ../make/defines.mk -include ../make/passthrough.mk +include $(OBJDIR)/make/passthrough.mk SUBDIRS=utils client server tools man --- cluster/gnbd/tools/Makefile 2007/08/29 03:09:55 1.4 +++ cluster/gnbd/tools/Makefile 2007/12/21 09:11:15 1.5 @@ -12,6 +12,6 @@ ############################################################################### include ../../make/defines.mk -include ../../make/passthrough.mk +include $(OBJDIR)/make/passthrough.mk SUBDIRS=fence_gnbd gnbd_export gnbd_import --- cluster/group/Makefile 2007/08/29 03:09:55 1.10 +++ cluster/group/Makefile 2007/12/21 09:11:15 1.11 @@ -11,6 +11,6 @@ ############################################################################### include ../make/defines.mk -include ../make/passthrough.mk +include $(OBJDIR)/make/passthrough.mk SUBDIRS=lib daemon tool dlm_controld gfs_controld man --- cluster/rgmanager/Makefile 2007/08/29 03:09:55 1.6 +++ cluster/rgmanager/Makefile 2007/12/21 09:11:15 1.7 @@ -12,6 +12,6 @@ ############################################################################### include ../make/defines.mk -include ../make/passthrough.mk +include $(OBJDIR)/make/passthrough.mk SUBDIRS=src man init.d --- cluster/rgmanager/src/Makefile 2007/08/29 03:09:55 1.5 +++ cluster/rgmanager/src/Makefile 2007/12/21 09:11:15 1.6 @@ -12,6 +12,6 @@ ############################################################################### include ../../make/defines.mk -include ../../make/passthrough.mk +include $(OBJDIR)/make/passthrough.mk SUBDIRS=resources clulib daemons utils --- cluster/fence/agents/bladecenter/Makefile 2007/08/30 18:40:35 1.7 +++ cluster/fence/agents/bladecenter/Makefile 2007/12/21 09:11:15 1.8 @@ -15,4 +15,4 @@ TARGET= fence_bladecenter -include ../../../make/fenceperl.mk +include $(OBJDIR)/make/fenceperl.mk --- cluster/fence/agents/ilo/Makefile 2007/08/30 18:40:36 1.6 +++ cluster/fence/agents/ilo/Makefile 2007/12/21 09:11:15 1.7 @@ -15,4 +15,4 @@ TARGET= fence_ilo -include ../../../make/fenceperl.mk +include $(OBJDIR)/make/fenceperl.mk --- cluster/fence/agents/xcat/Makefile 2007/08/30 18:40:37 1.5 +++ cluster/fence/agents/xcat/Makefile 2007/12/21 09:11:15 1.6 @@ -15,4 +15,4 @@ TARGET= fence_xcat -include ../../../make/fenceperl.mk +include $(OBJDIR)/make/fenceperl.mk --- cluster/fence/agents/ibmblade/Makefile 2007/08/30 18:40:36 1.5 +++ cluster/fence/agents/ibmblade/Makefile 2007/12/21 09:11:16 1.6 @@ -15,4 +15,4 @@ TARGET= fence_ibmblade -include ../../../make/fenceperl.mk +include $(OBJDIR)/make/fenceperl.mk --- cluster/fence/agents/mcdata/Makefile 2007/08/30 18:40:36 1.6 +++ cluster/fence/agents/mcdata/Makefile 2007/12/21 09:11:16 1.7 @@ -15,4 +15,4 @@ TARGET= fence_mcdata -include ../../../make/fenceperl.mk +include $(OBJDIR)/make/fenceperl.mk --- cluster/fence/agents/cpint/Makefile 2007/08/30 18:40:35 1.5 +++ cluster/fence/agents/cpint/Makefile 2007/12/21 09:11:16 1.6 @@ -15,4 +15,4 @@ TARGET= fence_cpint -include ../../../make/fenceperl.mk +include $(OBJDIR)/make/fenceperl.mk --- cluster/fence/agents/bullpap/Makefile 2007/08/30 18:40:35 1.7 +++ cluster/fence/agents/bullpap/Makefile 2007/12/21 09:11:16 1.8 @@ -15,4 +15,4 @@ TARGET= fence_bullpap -include ../../../make/fenceperl.mk +include $(OBJDIR)/make/fenceperl.mk --- cluster/fence/agents/vixel/Makefile 2007/08/30 18:40:36 1.6 +++ cluster/fence/agents/vixel/Makefile 2007/12/21 09:11:16 1.7 @@ -15,4 +15,4 @@ TARGET= fence_vixel -include ../../../make/fenceperl.mk +include $(OBJDIR)/make/fenceperl.mk --- cluster/fence/agents/zvm/Makefile 2007/08/30 18:40:37 1.5 +++ cluster/fence/agents/zvm/Makefile 2007/12/21 09:11:16 1.6 @@ -15,4 +15,4 @@ TARGET= fence_zvm -include ../../../make/fenceperl.mk +include $(OBJDIR)/make/fenceperl.mk --- cluster/fence/agents/drac/Makefile 2007/08/30 18:40:36 1.6 +++ cluster/fence/agents/drac/Makefile 2007/12/21 09:11:16 1.7 @@ -15,4 +15,4 @@ TARGET= fence_drac -include ../../../make/fenceperl.mk +include $(OBJDIR)/make/fenceperl.mk --- cluster/fence/agents/sanbox2/Makefile 2007/08/30 18:40:36 1.6 +++ cluster/fence/agents/sanbox2/Makefile 2007/12/21 09:11:16 1.7 @@ -15,4 +15,4 @@ TARGET= fence_sanbox2 -include ../../../make/fenceperl.mk +include $(OBJDIR)/make/fenceperl.mk --- cluster/fence/agents/baytech/Makefile 2007/08/30 18:40:35 1.5 +++ cluster/fence/agents/baytech/Makefile 2007/12/21 09:11:16 1.6 @@ -15,4 +15,4 @@ TARGET= fence_baytech -include ../../../make/fenceperl.mk +include $(OBJDIR)/make/fenceperl.mk --- cluster/fence/agents/vmware/Makefile 2007/08/30 18:40:36 1.5 +++ cluster/fence/agents/vmware/Makefile 2007/12/21 09:11:16 1.6 @@ -15,4 +15,4 @@ TARGET= fence_vmware -include ../../../make/fenceperl.mk +include $(OBJDIR)/make/fenceperl.mk --- cluster/fence/agents/brocade/Makefile 2007/08/30 18:40:35 1.6 +++ cluster/fence/agents/brocade/Makefile 2007/12/21 09:11:17 1.7 @@ -15,4 +15,4 @@ TARGET= fence_brocade -include ../../../make/fenceperl.mk +include $(OBJDIR)/make/fenceperl.mk --- cluster/fence/agents/wti/Makefile 2007/08/30 18:40:36 1.6 +++ cluster/fence/agents/wti/Makefile 2007/12/21 09:11:17 1.7 @@ -15,4 +15,4 @@ TARGET= fence_wti -include ../../../make/fenceperl.mk +include $(OBJDIR)/make/fenceperl.mk --- cluster/fence/agents/egenera/Makefile 2007/08/30 18:40:36 1.6 +++ cluster/fence/agents/egenera/Makefile 2007/12/21 09:11:17 1.7 @@ -15,4 +15,4 @@ TARGET= fence_egenera -include ../../../make/fenceperl.mk +include $(OBJDIR)/make/fenceperl.mk --- cluster/fence/agents/rsb/Makefile 2007/08/30 18:41:31 1.7 +++ cluster/fence/agents/rsb/Makefile 2007/12/21 09:11:17 1.8 @@ -15,4 +15,4 @@ TARGET= fence_rsb -include ../../../make/fencepy.mk +include $(OBJDIR)/make/fencepy.mk --- cluster/fence/agents/rsa/Makefile 2007/08/30 18:41:31 1.7 +++ cluster/fence/agents/rsa/Makefile 2007/12/21 09:11:17 1.8 @@ -15,4 +15,4 @@ TARGET= fence_rsa -include ../../../make/fencepy.mk +include $(OBJDIR)/make/fencepy.mk --- cluster/fence/agents/apc/Makefile 2007/08/30 18:41:31 1.7 +++ cluster/fence/agents/apc/Makefile 2007/12/21 09:11:17 1.8 @@ -15,4 +15,4 @@ TARGET= fence_apc -include ../../../make/fencepy.mk +include $(OBJDIR)/make/fencepy.mk