From: fabbione@sourceware.org <fabbione@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] cluster ccs/ccs_test/Makefile ccs/ccs_tool/Mak ...
Date: 21 Dec 2007 20:14:06 -0000 [thread overview]
Message-ID: <20071221201406.11313.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: fabbione at sourceware.org 2007-12-21 20:13:55
Modified files:
ccs/ccs_test : Makefile
ccs/ccs_tool : Makefile
ccs/daemon : Makefile
ccs/lib : Makefile
ccs/man : Makefile
cman/cman_tool : Makefile
cman/daemon : Makefile
cman/init.d : Makefile
cman/lib : Makefile
cman/man : Makefile
cman/qdisk : Makefile
cman/tests : Makefile
dlm/lib : Makefile
dlm/man : Makefile
dlm/tests/usertest: Makefile
dlm/tool : Makefile
fence/agents/apc: Makefile
fence/agents/baytech: Makefile
fence/agents/bladecenter: Makefile
fence/agents/brocade: Makefile
fence/agents/bullpap: Makefile
fence/agents/cpint: Makefile
fence/agents/drac: Makefile
fence/agents/egenera: Makefile
fence/agents/ibmblade: Makefile
fence/agents/ilo: Makefile
fence/agents/ipmilan: Makefile
fence/agents/manual: Makefile
fence/agents/mcdata: Makefile
fence/agents/rackswitch: Makefile
fence/agents/rps10: Makefile
fence/agents/rsa: Makefile
fence/agents/rsb: Makefile
fence/agents/sanbox2: Makefile
fence/agents/scsi: Makefile
fence/agents/vixel: Makefile
fence/agents/vmware: Makefile
fence/agents/wti: Makefile
fence/agents/xcat: Makefile
fence/agents/xvm: Makefile
fence/agents/zvm: Makefile
fence/fence_node: Makefile
fence/fence_tool: Makefile
fence/fenced : Makefile
fence/man : Makefile
gfs/gfs_debug : Makefile
gfs/gfs_edit : Makefile
gfs/gfs_fsck : Makefile
gfs/gfs_grow : Makefile
gfs/gfs_jadd : Makefile
gfs/gfs_mkfs : Makefile
gfs/gfs_quota : Makefile
gfs/gfs_tool : Makefile
gfs/init.d : Makefile
gfs/libgfs : Makefile
gfs/man : Makefile
gfs/tests/filecon2: Makefile
gfs/tests/mmdd : Makefile
gfs-kernel/src/gfs: Makefile
gfs2/convert : Makefile
gfs2/edit : Makefile
gfs2/fsck : Makefile
gfs2/init.d : Makefile
gfs2/libgfs2 : Makefile
gfs2/man : Makefile
gfs2/mkfs : Makefile
gfs2/mount : Makefile
gfs2/quota : Makefile
gfs2/tool : Makefile
gnbd/client : Makefile
gnbd/man : Makefile
gnbd/server : Makefile
gnbd/tools/fence_gnbd: Makefile
gnbd/tools/gnbd_export: Makefile
gnbd/tools/gnbd_import: Makefile
gnbd/utils : Makefile
gnbd-kernel/src: Makefile
group/daemon : Makefile
group/dlm_controld: Makefile
group/gfs_controld: Makefile
group/lib : Makefile
group/man : Makefile
group/test : Makefile
group/tool : Makefile
make : fenceperl.mk fencepy.mk
rgmanager/init.d: Makefile
rgmanager/man : Makefile
rgmanager/src/clulib: Makefile
rgmanager/src/daemons: Makefile
rgmanager/src/utils: Makefile
Added files:
make : clean.mk
Log message:
Collapse all common clean: target bits into make/clean.mk generalclean: target.
Update all relevant makefile's to use generalclean.
Required by this change:
all TARGETS need to be defined before sourcing *.mk files to allow
simpler var expantions.
update all makefiles as a consequence
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_test/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_tool/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/lib/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/man/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/Makefile.diff?cvsroot=cluster&r1=1.27&r2=1.28
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/Makefile.diff?cvsroot=cluster&r1=1.58&r2=1.59
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/init.d/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/lib/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/man/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/tests/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/lib/Makefile.diff?cvsroot=cluster&r1=1.24&r2=1.25
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/man/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tests/usertest/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tool/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/apc/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/baytech/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/bladecenter/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/brocade/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/bullpap/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/cpint/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/drac/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/egenera/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ibmblade/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ilo/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ipmilan/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/manual/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/mcdata/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rackswitch/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rps10/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rsa/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rsb/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/sanbox2/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/scsi/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/vixel/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/vmware/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.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xcat/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/zvm/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_node/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_tool/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/man/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_debug/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_edit/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_fsck/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_grow/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_jadd/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_mkfs/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_quota/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_tool/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/init.d/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/libgfs/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/man/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/tests/filecon2/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/tests/mmdd/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/convert/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/edit/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/fsck/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/init.d/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/man/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/Makefile.diff?cvsroot=cluster&r1=1.23&r2=1.24
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mount/Makefile.diff?cvsroot=cluster&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/quota/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/client/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/man/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/server/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/fence_gnbd/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_export/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_import/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/utils/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd-kernel/src/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/daemon/Makefile.diff?cvsroot=cluster&r1=1.23&r2=1.24
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/dlm_controld/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/lib/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/man/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/test/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/tool/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/clean.mk.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/fenceperl.mk.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/fencepy.mk.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/init.d/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/man/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/clulib/Makefile.diff?cvsroot=cluster&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/Makefile.diff?cvsroot=cluster&r1=1.28&r2=1.29
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/Makefile.diff?cvsroot=cluster&r1=1.21&r2=1.22
--- cluster/ccs/ccs_test/Makefile 2007/12/21 09:15:13 1.11
+++ cluster/ccs/ccs_test/Makefile 2007/12/21 20:13:43 1.12
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGET= ccs_test
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= ccs_test
+include $(OBJDIR)/make/clean.mk
OBJS= ccs_test.o
@@ -38,7 +39,6 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -rf *.o ${TARGET} *~
+clean: generalclean
.PHONY: all ${TARGET}
--- cluster/ccs/ccs_tool/Makefile 2007/12/21 09:15:14 1.17
+++ cluster/ccs/ccs_tool/Makefile 2007/12/21 20:13:43 1.18
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGET= ccs_tool
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= ccs_tool
+include $(OBJDIR)/make/clean.mk
OBJS= ccs_tool.o \
update.o \
@@ -37,9 +38,6 @@
depends:
$(MAKE) -C ../lib all
-clean:
- rm -f *.o ccs_tool *~
-
install: all
install -d ${sbindir}
install ccs_tool ${sbindir}
@@ -47,4 +45,6 @@
uninstall:
${UNINSTALL} ccs_tool ${sbindir}
+clean: generalclean
+
.PHONY: all ${TARGET}
--- cluster/ccs/daemon/Makefile 2007/12/21 09:15:14 1.19
+++ cluster/ccs/daemon/Makefile 2007/12/21 20:13:43 1.20
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGET= ccsd
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= ccsd
+include $(OBJDIR)/make/clean.mk
OBJS= ccsd.o \
cnx_mgr.o \
@@ -44,7 +45,6 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -rf *.o ${TARGET} *~
+clean: generalclean
.PHONY: all ${TARGET}
--- cluster/ccs/lib/Makefile 2007/12/21 09:15:14 1.11
+++ cluster/ccs/lib/Makefile 2007/12/21 20:13:43 1.12
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGET=libccs.a
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET=libccs.a
+include $(OBJDIR)/make/clean.mk
OBJS= libccs.o \
log.o
@@ -42,5 +43,5 @@
${UNINSTALL} ${TARGET} ${libdir}
${UNINSTALL} ccs.h ${incdir}
-clean:
- rm -rf *~ *.o ${TARGET} ccs.h.gch log.c
+clean: generalclean
+ rm -rf ccs.h.gch log.c
--- cluster/ccs/man/Makefile 2007/12/21 18:37:15 1.6
+++ cluster/ccs/man/Makefile 2007/12/21 20:13:43 1.7
@@ -11,11 +11,11 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/man.mk
-
TARGET= cluster.conf.5 \
ccs.7 \
ccsd.8 \
ccs_test.8 \
ccs_tool.8
+
+include ../../make/defines.mk
+include $(OBJDIR)/make/man.mk
--- cluster/cman/cman_tool/Makefile 2007/12/21 09:15:14 1.27
+++ cluster/cman/cman_tool/Makefile 2007/12/21 20:13:43 1.28
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGET= cman_tool
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET=cman_tool
+include $(OBJDIR)/make/clean.mk
OBJS= main.o \
join.o
@@ -39,5 +40,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
--- cluster/cman/daemon/Makefile 2007/12/21 09:15:14 1.58
+++ cluster/cman/daemon/Makefile 2007/12/21 20:13:43 1.59
@@ -10,8 +10,11 @@
###############################################################################
###############################################################################
+TARGET= service_cman.lcrso
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
CFLAGS += -DOPENAIS_EXTERNAL_SERVICE
CFLAGS += -fPIC
@@ -20,8 +23,6 @@
LDFLAGS += -L${ccslibdir} -lccs
-TARGET= service_cman.lcrso
-
OBJS= daemon.o \
config.o \
logging.o \
@@ -45,5 +46,4 @@
uninstall:
rm -f ${libexecdir}/lcrso/${TARGET}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
--- cluster/cman/init.d/Makefile 2007/12/20 22:09:57 1.5
+++ cluster/cman/init.d/Makefile 2007/12/21 20:13:43 1.6
@@ -10,9 +10,9 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
+TARGETS= cman qdiskd
-TARGET= cman qdiskd
+include ../../make/defines.mk
all:
@@ -23,4 +23,4 @@
install $(S)/cman $(S)/qdiskd ${DESTDIR}/etc/init.d
uninstall:
- ${UNINSTALL} ${TARGET} ${DESTDIR}/etc/init.d
+ ${UNINSTALL} ${TARGETS} ${DESTDIR}/etc/init.d
--- cluster/cman/lib/Makefile 2007/12/21 09:15:14 1.13
+++ cluster/cman/lib/Makefile 2007/12/21 20:13:44 1.14
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET=libcman
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET=libcman
+include $(OBJDIR)/make/clean.mk
SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR}
STATICLIB=$(TARGET).a
@@ -51,6 +52,4 @@
$(TARGET).so.$(RELEASE_MAJOR) \
${TARGET}.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}
-clean:
- rm -f *.o *.a *.so *.so.*
- rm -f *~
+clean: generalclean
--- cluster/cman/man/Makefile 2007/12/21 18:37:15 1.6
+++ cluster/cman/man/Makefile 2007/12/21 20:13:44 1.7
@@ -11,11 +11,11 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/man.mk
-
TARGET= cman.5 \
qdisk.5 \
cman_tool.8 \
qdiskd.8 \
mkqdisk.8
+
+include ../../make/defines.mk
+include $(OBJDIR)/make/man.mk
--- cluster/cman/qdisk/Makefile 2007/12/21 09:15:14 1.15
+++ cluster/cman/qdisk/Makefile 2007/12/21 20:13:44 1.16
@@ -10,8 +10,12 @@
###############################################################################
###############################################################################
+TARGET1= qdiskd
+TARGET2= mkqdisk
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
CFLAGS += -D_GNU_SOURCE
CFLAGS += -Werror -Wstrict-prototypes -Wshadow
@@ -22,9 +26,6 @@
EXTRA_LDFLAGS += -L${cmanlibdir} -L${ccslibdir} -lcman -lccs
EXTRA_LDFLAGS += -lpthread
-TARGET1= qdiskd
-TARGET2= mkqdisk
-
OBJS1= main.o \
score.o \
bitmap.o \
@@ -54,8 +55,7 @@
depends:
$(MAKE) -C ../lib all
-clean:
- rm -f *.o ${TARGET1} ${TARGET2}
+clean: generalclean
uninstall:
${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
--- cluster/cman/tests/Makefile 2007/12/21 09:15:14 1.11
+++ cluster/cman/tests/Makefile 2007/12/21 20:13:44 1.12
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGETS= client libtest sysman sysmand
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGETS= client libtest sysman sysmand
+include $(OBJDIR)/make/clean.mk
CFLAGS += -I${cmanincdir}
CFLAGS += -I${incdir}
@@ -30,5 +31,4 @@
install: all
-clean:
- rm -f *.o ${TARGETS}
+clean: generalclean
--- cluster/dlm/lib/Makefile 2007/12/21 09:15:15 1.24
+++ cluster/dlm/lib/Makefile 2007/12/21 20:13:44 1.25
@@ -11,12 +11,13 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET= libdlm
AISTARGET= libaislock
+include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR} $(TARGET)_lt.so.${RELEASE_MAJOR}.${RELEASE_MINOR}
STATICLIB=$(TARGET).a $(TARGET)_lt.a
@@ -86,6 +87,4 @@
$(TARGET)_lt.so.$(RELEASE_MAJOR) \
${TARGET}_lt.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}
-clean:
- rm -f *.o *.a *.so *.so.* *.po
- rm -f *~
+clean: generalclean
--- cluster/dlm/man/Makefile 2007/12/21 20:00:28 1.9
+++ cluster/dlm/man/Makefile 2007/12/21 20:13:44 1.10
@@ -10,9 +10,6 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/man.mk
-
TARGET= dlm_cleanup.3 \
dlm_close_lockspace.3 \
dlm_create_lockspace.3 \
@@ -34,3 +31,6 @@
dlm_unlock_wait.3 \
libdlm.3 \
dlm_tool.8
+
+include ../../make/defines.mk
+include $(OBJDIR)/make/man.mk
--- cluster/dlm/tests/usertest/Makefile 2007/12/21 09:15:15 1.15
+++ cluster/dlm/tests/usertest/Makefile 2007/12/21 20:13:45 1.16
@@ -10,11 +10,12 @@
###############################################################################
###############################################################################
+TARGETS= dlmtest asttest lstest pingtest lvb \
+ dlmtest2 flood alternate-lvb joinleave threads
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-
-TARGETS= dlmtest asttest lstest pingtest lvb dlmtest2 flood alternate-lvb joinleave threads
+include $(OBJDIR)/make/clean.mk
all: depends ${TARGETS}
@@ -29,5 +30,4 @@
%: %.o
$(CC) -o $@ $^ $(LDFLAGS)
-clean:
- rm -f *.o ${TARGETS} *~ core
+clean: generalclean
--- cluster/dlm/tool/Makefile 2007/12/21 09:15:15 1.6
+++ cluster/dlm/tool/Makefile 2007/12/21 20:13:45 1.7
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGET= dlm_tool
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= dlm_tool
+include $(OBJDIR)/make/clean.mk
OBJS= main.o
@@ -28,8 +29,7 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
install: all
install -d ${sbindir}
--- cluster/fence/agents/apc/Makefile 2007/12/21 09:11:17 1.8
+++ cluster/fence/agents/apc/Makefile 2007/12/21 20:13:45 1.9
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_apc
+include ../../../make/defines.mk
include $(OBJDIR)/make/fencepy.mk
--- cluster/fence/agents/baytech/Makefile 2007/12/21 09:11:16 1.6
+++ cluster/fence/agents/baytech/Makefile 2007/12/21 20:13:45 1.7
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_baytech
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/bladecenter/Makefile 2007/12/21 09:11:15 1.8
+++ cluster/fence/agents/bladecenter/Makefile 2007/12/21 20:13:45 1.9
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_bladecenter
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/brocade/Makefile 2007/12/21 09:11:17 1.7
+++ cluster/fence/agents/brocade/Makefile 2007/12/21 20:13:45 1.8
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_brocade
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/bullpap/Makefile 2007/12/21 09:11:16 1.8
+++ cluster/fence/agents/bullpap/Makefile 2007/12/21 20:13:45 1.9
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_bullpap
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/cpint/Makefile 2007/12/21 09:11:16 1.6
+++ cluster/fence/agents/cpint/Makefile 2007/12/21 20:13:46 1.7
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_cpint
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/drac/Makefile 2007/12/21 09:11:16 1.7
+++ cluster/fence/agents/drac/Makefile 2007/12/21 20:13:46 1.8
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_drac
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/egenera/Makefile 2007/12/21 09:11:17 1.7
+++ cluster/fence/agents/egenera/Makefile 2007/12/21 20:13:46 1.8
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_egenera
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/ibmblade/Makefile 2007/12/21 09:11:16 1.6
+++ cluster/fence/agents/ibmblade/Makefile 2007/12/21 20:13:46 1.7
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_ibmblade
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/ilo/Makefile 2007/12/21 09:11:15 1.7
+++ cluster/fence/agents/ilo/Makefile 2007/12/21 20:13:46 1.8
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_ilo
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/ipmilan/Makefile 2007/12/21 09:15:15 1.10
+++ cluster/fence/agents/ipmilan/Makefile 2007/12/21 20:13:46 1.11
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= fence_ipmilan
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= fence_ipmilan
+include $(OBJDIR)/make/clean.mk
OBJS= expect.o \
ipmilan.o
@@ -35,5 +36,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
--- cluster/fence/agents/manual/Makefile 2007/12/20 22:09:58 1.12
+++ cluster/fence/agents/manual/Makefile 2007/12/21 20:13:46 1.13
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_ack_manual
+include ../../../make/defines.mk
+include $(OBJDIR)/make/clean.mk
+
all: ${TARGET}
# Using manual override instead of the binary version.
@@ -32,5 +33,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
--- cluster/fence/agents/mcdata/Makefile 2007/12/21 09:11:16 1.7
+++ cluster/fence/agents/mcdata/Makefile 2007/12/21 20:13:46 1.8
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_mcdata
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/rackswitch/Makefile 2007/12/21 09:15:15 1.8
+++ cluster/fence/agents/rackswitch/Makefile 2007/12/21 20:13:46 1.9
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= fence_rackswitch
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= fence_rackswitch
+include $(OBJDIR)/make/clean.mk
OBJS= do_rack.o
@@ -34,6 +35,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET} *~
-
+clean: generalclean
--- cluster/fence/agents/rps10/Makefile 2007/12/21 09:15:15 1.8
+++ cluster/fence/agents/rps10/Makefile 2007/12/21 20:13:47 1.9
@@ -11,8 +11,11 @@
###############################################################################
###############################################################################
+TARGET= fence_rps10
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
TARGET= fence_rps10
@@ -34,5 +37,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
--- cluster/fence/agents/rsa/Makefile 2007/12/21 09:11:17 1.8
+++ cluster/fence/agents/rsa/Makefile 2007/12/21 20:13:47 1.9
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_rsa
+include ../../../make/defines.mk
include $(OBJDIR)/make/fencepy.mk
--- cluster/fence/agents/rsb/Makefile 2007/12/21 09:11:17 1.8
+++ cluster/fence/agents/rsb/Makefile 2007/12/21 20:13:47 1.9
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_rsb
+include ../../../make/defines.mk
include $(OBJDIR)/make/fencepy.mk
--- cluster/fence/agents/sanbox2/Makefile 2007/12/21 09:11:16 1.7
+++ cluster/fence/agents/sanbox2/Makefile 2007/12/21 20:13:47 1.8
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_sanbox2
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/scsi/Makefile 2007/12/20 22:09:58 1.15
+++ cluster/fence/agents/scsi/Makefile 2007/12/21 20:13:47 1.16
@@ -10,11 +10,12 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_scsi
SCRIPT= scsi_reserve
+include ../../../make/defines.mk
+include $(OBJDIR)/make/clean.mk
+
all: $(TARGET) $(TARGET)_test
$(TARGET):
@@ -49,5 +50,4 @@
${UNINSTALL} ${TARGET} ${TARGET}_test ${sbindir}
${UNINSTALL} ${SCRIPT} ${DESTDIR}/etc/init.d
-clean:
- rm -f $(TARGET) $(TARGET)_test
+clean: generalclean
--- cluster/fence/agents/vixel/Makefile 2007/12/21 09:11:16 1.7
+++ cluster/fence/agents/vixel/Makefile 2007/12/21 20:13:47 1.8
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_vixel
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/vmware/Makefile 2007/12/21 09:11:16 1.6
+++ cluster/fence/agents/vmware/Makefile 2007/12/21 20:13:47 1.7
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_vmware
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/wti/Makefile 2007/12/21 09:11:17 1.7
+++ cluster/fence/agents/wti/Makefile 2007/12/21 20:13:47 1.8
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_wti
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/xcat/Makefile 2007/12/21 09:11:15 1.6
+++ cluster/fence/agents/xcat/Makefile 2007/12/21 20:13:47 1.7
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_xcat
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/agents/xvm/Makefile 2007/12/21 09:15:15 1.17
+++ cluster/fence/agents/xvm/Makefile 2007/12/21 20:13:48 1.18
@@ -10,13 +10,14 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET1= fence_xvm
TARGET2= fence_xvmd
TARGET3= testprog
+include ../../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
OBJS1= fence_xvm.o \
ip_lookup.o
@@ -61,8 +62,7 @@
${TARGET3}: ${OBJS3}
$(CC) -o $@ $^ $(XML_LDFLAGS)
-clean:
- rm -f ${TARGET1} ${TARGET2} ${TARGET3} *~ *.o
+clean: generalclean
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/fence/agents/zvm/Makefile 2007/12/21 09:11:16 1.6
+++ cluster/fence/agents/zvm/Makefile 2007/12/21 20:13:48 1.7
@@ -11,8 +11,7 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-
TARGET= fence_zvm
+include ../../../make/defines.mk
include $(OBJDIR)/make/fenceperl.mk
--- cluster/fence/fence_node/Makefile 2007/12/21 09:15:15 1.12
+++ cluster/fence/fence_node/Makefile 2007/12/21 20:13:48 1.13
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET = fence_node
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET = fence_node
+include $(OBJDIR)/make/clean.mk
OBJS= ../fenced/agent.o \
fence_node.o
@@ -41,5 +42,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -rf *~ *.o ${TARGET}
+clean: generalclean
--- cluster/fence/fence_tool/Makefile 2007/12/21 09:15:15 1.19
+++ cluster/fence/fence_tool/Makefile 2007/12/21 20:13:49 1.20
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET = fence_tool
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET = fence_tool
+include $(OBJDIR)/make/clean.mk
OBJS= ../fenced/agent.o \
fence_tool.o
@@ -41,5 +42,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -rf *~ *.o ${TARGET} agent.c
+clean: generalclean
--- cluster/fence/fenced/Makefile 2007/12/21 09:15:15 1.15
+++ cluster/fence/fenced/Makefile 2007/12/21 20:13:49 1.16
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET = fenced
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET = fenced
+include $(OBJDIR)/make/clean.mk
OBJS= main.o \
recover.o \
@@ -44,5 +45,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -rf *~ *.o ${TARGET}
+clean: generalclean
--- cluster/fence/man/Makefile 2007/12/21 18:37:15 1.13
+++ cluster/fence/man/Makefile 2007/12/21 20:13:49 1.14
@@ -11,9 +11,6 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/man.mk
-
TARGET= fence.8 \
fence_ack_manual.8 \
fence_apc.8 \
@@ -36,3 +33,6 @@
fence_xvm.8 \
fence_xvmd.8 \
fenced.8
+
+include ../../make/defines.mk
+include $(OBJDIR)/make/man.mk
--- cluster/gfs/gfs_debug/Makefile 2007/12/21 09:15:16 1.12
+++ cluster/gfs/gfs_debug/Makefile 2007/12/21 20:13:49 1.13
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= gfs_debug
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gfs_debug
+include $(OBJDIR)/make/clean.mk
OBJS= block_device.o \
basic.o \
@@ -42,7 +43,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
-
-
+clean: generalclean
--- cluster/gfs/gfs_edit/Makefile 2007/12/21 09:15:16 1.12
+++ cluster/gfs/gfs_edit/Makefile 2007/12/21 20:13:49 1.13
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= gfs_edit
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gfs_edit
+include $(OBJDIR)/make/clean.mk
OBJS= gfshex.o \
hexedit.o
@@ -40,5 +41,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
--- cluster/gfs/gfs_fsck/Makefile 2007/12/21 09:15:16 1.15
+++ cluster/gfs/gfs_fsck/Makefile 2007/12/21 20:13:49 1.16
@@ -10,12 +10,13 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET1= gfs_fsck
TARGET2= fsck.gfs
+include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
OBJS= bio.o \
bitmap.o \
block_list.o \
@@ -66,8 +67,8 @@
test_bitmap: bitmap.o test_bitmap.o log.o
$(CC) -o $@ $^ $(LDFLAGS)
-clean:
- rm -f *.o *~ *.d ${TARGET1} ${TARGET2} cscope.* test_inode_list *.orig *.rej test_block_list test_bitmap
+clean: generalclean
+ rm -f test_block_list test_bitmap
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/gfs/gfs_grow/Makefile 2007/12/21 09:15:16 1.13
+++ cluster/gfs/gfs_grow/Makefile 2007/12/21 20:13:49 1.14
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= gfs_grow
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gfs_grow
+include $(OBJDIR)/make/clean.mk
OBJS= main.o \
ondisk.o
@@ -43,7 +44,6 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
.PHONY: all ${TARGET}
--- cluster/gfs/gfs_jadd/Makefile 2007/12/21 09:15:16 1.13
+++ cluster/gfs/gfs_jadd/Makefile 2007/12/21 20:13:50 1.14
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= gfs_jadd
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gfs_jadd
+include $(OBJDIR)/make/clean.mk
OBJS= main.o \
ondisk.o
@@ -43,7 +44,6 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
.PHONY: all ${TARGET}
--- cluster/gfs/gfs_mkfs/Makefile 2007/12/21 09:15:16 1.14
+++ cluster/gfs/gfs_mkfs/Makefile 2007/12/21 20:13:50 1.15
@@ -11,12 +11,13 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET1= gfs_mkfs
TARGET2= mkfs.gfs
+include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
OBJS= device_geometry.o \
fs_geometry.o \
locking.o \
@@ -53,7 +54,6 @@
uninstall:
${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-clean:
- rm -f *.o ${TARGET1} ${TARGET2}
+clean: generalclean
.PHONY: all ${TARGET1}
--- cluster/gfs/gfs_quota/Makefile 2007/12/21 09:15:16 1.13
+++ cluster/gfs/gfs_quota/Makefile 2007/12/21 20:13:50 1.14
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= gfs_quota
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gfs_quota
+include $(OBJDIR)/make/clean.mk
OBJS= check.o \
main.o \
@@ -41,7 +42,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
-
-
+clean: generalclean
--- cluster/gfs/gfs_tool/Makefile 2007/12/21 09:15:16 1.17
+++ cluster/gfs/gfs_tool/Makefile 2007/12/21 20:13:50 1.18
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= gfs_tool
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gfs_tool
+include $(OBJDIR)/make/clean.mk
OBJS= counters.o \
df.o \
@@ -45,7 +46,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
-
-
+clean: generalclean
--- cluster/gfs/init.d/Makefile 2007/12/20 22:10:00 1.5
+++ cluster/gfs/init.d/Makefile 2007/12/21 20:13:50 1.6
@@ -10,10 +10,10 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-
TARGET= gfs
+include ../../make/defines.mk
+
all:
clean:
--- cluster/gfs/libgfs/Makefile 2007/12/21 09:15:16 1.13
+++ cluster/gfs/libgfs/Makefile 2007/12/21 20:13:50 1.14
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET=libgfs.a
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET=libgfs.a
+include $(OBJDIR)/make/clean.mk
CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
CFLAGS += -D_GNU_SOURCE -DHELPER_PROGRAM
@@ -49,7 +50,6 @@
uninstall:
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
.PHONY: all
--- cluster/gfs/man/Makefile 2007/12/21 18:37:15 1.6
+++ cluster/gfs/man/Makefile 2007/12/21 20:13:50 1.7
@@ -11,9 +11,6 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/man.mk
-
TARGET= gfs.8 \
gfs_mount.8 \
gfs_fsck.8 \
@@ -22,3 +19,6 @@
gfs_mkfs.8 \
gfs_quota.8 \
gfs_tool.8
+
+include ../../make/defines.mk
+include $(OBJDIR)/make/man.mk
--- cluster/gfs/tests/filecon2/Makefile 2007/12/21 09:15:17 1.4
+++ cluster/gfs/tests/filecon2/Makefile 2007/12/21 20:13:51 1.5
@@ -13,6 +13,7 @@
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
TARGETS= filecon2_server filecon2_client
@@ -25,6 +26,4 @@
%: %.o
$(CC) -o $@ $^ $(LDFLAGS)
-clean:
- rm -f *.o *.s *.a *~ core .depend $(TARGETS)
-
+clean: generalclean
--- cluster/gfs/tests/mmdd/Makefile 2007/08/29 02:51:38 1.2
+++ cluster/gfs/tests/mmdd/Makefile 2007/12/21 20:13:51 1.3
@@ -12,6 +12,7 @@
###############################################################################
include ../../../make/defines.mk
+include $(OBJDIR)/make/clean.mk
TARGETS= mmdd sfdd
@@ -28,5 +29,4 @@
%: %.o
$(CC) -o $@ $^ $(LDFLAGS)
-clean:
- rm -f *.o *.s *.a *~ core .depend $(TARGETS)
+clean: generalclean
--- cluster/gfs-kernel/src/gfs/Makefile 2007/12/21 09:05:34 1.18
+++ cluster/gfs-kernel/src/gfs/Makefile 2007/12/21 20:13:51 1.19
@@ -13,6 +13,7 @@
ifndef USING_KBUILD
include ../../../make/defines.mk
+include $(OBJDIR)/make/clean.mk
endif
PWD := $(shell pwd)
@@ -72,9 +73,6 @@
${UNINSTALL} gfs.ko ${module_dir}/fs/gfs
${UNINSTALL} gfs_ondisk.h gfs_ioctl.h ${incdir}/linux
-clean:
- rm -rf linux *.o .*.o.cmd .gfs.ko.cmd \
- gfs.ko gfs.mod.c .tmp_versions *~ *~* \
- Module.symvers .*.o.d
+clean: generalclean
distclean: clean
--- cluster/gfs2/convert/Makefile 2007/12/21 09:15:17 1.14
+++ cluster/gfs2/convert/Makefile 2007/12/21 20:13:51 1.15
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGET= gfs2_convert
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gfs2_convert
+include $(OBJDIR)/make/clean.mk
OBJS= gfs2_convert.o
@@ -41,7 +42,6 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
.PHONY: all ${TARGET}
--- cluster/gfs2/edit/Makefile 2007/12/21 09:15:17 1.14
+++ cluster/gfs2/edit/Makefile 2007/12/21 20:13:51 1.15
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= gfs2_edit
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gfs2_edit
+include $(OBJDIR)/make/clean.mk
OBJS= gfs2hex.o \
savemeta.o \
@@ -46,7 +47,6 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
.PHONY: all ${TARGET}
--- cluster/gfs2/fsck/Makefile 2007/12/21 09:15:17 1.18
+++ cluster/gfs2/fsck/Makefile 2007/12/21 20:13:51 1.19
@@ -10,12 +10,13 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET1= fsck.gfs2
TARGET2= gfs2_fsck
+include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
OBJS= eattr.o \
fs_recovery.o \
hash.o \
@@ -60,8 +61,8 @@
test_bitmap: test_bitmap.o log.o
$(CC) -o $@ $^ $(LDFLAGS)
-clean:
- rm -f ${TARGET1} ${TARGET2} *.o *~ *.d cscope.* test_inode_list *.orig *.rej test_block_list test_bitmap
+clean: generalclean
+ rm -f test_block_list test_bitmap
install: all
if [ ! -d ${sbindir} ]; then \
--- cluster/gfs2/init.d/Makefile 2007/12/20 22:10:01 1.5
+++ cluster/gfs2/init.d/Makefile 2007/12/21 20:13:51 1.6
@@ -10,10 +10,10 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-
TARGET= gfs2
+include ../../make/defines.mk
+
all:
clean:
--- cluster/gfs2/libgfs2/Makefile 2007/12/21 09:15:17 1.15
+++ cluster/gfs2/libgfs2/Makefile 2007/12/21 20:13:51 1.16
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= libgfs2.a
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= libgfs2.a
+include $(OBJDIR)/make/clean.mk
CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
@@ -48,7 +49,6 @@
uninstall:
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
.PHONY: all
--- cluster/gfs2/man/Makefile 2007/12/21 18:37:16 1.6
+++ cluster/gfs2/man/Makefile 2007/12/21 20:13:51 1.7
@@ -11,9 +11,6 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/man.mk
-
TARGET= gfs2.8 \
gfs2_convert.8 \
gfs2_edit.8 \
@@ -24,3 +21,6 @@
gfs2_quota.8 \
gfs2_tool.8 \
mkfs.gfs2.8
+
+include ../../make/defines.mk
+include $(OBJDIR)/make/man.mk
--- cluster/gfs2/mkfs/Makefile 2007/12/21 09:15:18 1.23
+++ cluster/gfs2/mkfs/Makefile 2007/12/21 20:13:51 1.24
@@ -3,14 +3,15 @@
#
.PHONY: all clean install
-include ../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET1= mkfs.gfs2
TARGET2= gfs2_mkfs
TARGET3= gfs2_jadd
TARGET4= gfs2_grow
+include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
OBJS= main.o \
main_mkfs.o \
main_grow.o \
@@ -51,7 +52,6 @@
uninstall:
${UNINSTALL} ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${sbindir}
-clean:
- rm -f *.o ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4}
+clean: generalclean
.PHONY: all ${TARGET1}
--- cluster/gfs2/mount/Makefile 2007/12/21 09:15:18 1.21
+++ cluster/gfs2/mount/Makefile 2007/12/21 20:13:52 1.22
@@ -10,12 +10,13 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET1= mount.gfs2
TARGET2= umount.gfs2
+include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
OBJS1= mount.gfs2.o
OBJS2= umount.gfs2.o
@@ -45,6 +46,4 @@
uninstall:
${UNINSTALL} ${TARGET1} ${TARGET2} ${DESTDIR}/sbin
-clean:
- rm -f *.o ${TARGET1} ${TARGET2}
-
+clean: generalclean
--- cluster/gfs2/quota/Makefile 2007/12/21 09:15:18 1.15
+++ cluster/gfs2/quota/Makefile 2007/12/21 20:13:52 1.16
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= gfs2_quota
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gfs2_quota
+include $(OBJDIR)/make/clean.mk
OBJS= main.o \
names.o \
@@ -41,7 +42,6 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
.PHONY: all ${TARGET}
--- cluster/gfs2/tool/Makefile 2007/12/21 09:15:18 1.17
+++ cluster/gfs2/tool/Makefile 2007/12/21 20:13:52 1.18
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= gfs2_tool
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gfs2_tool
+include $(OBJDIR)/make/clean.mk
OBJS= counters.o \
df.o \
@@ -49,7 +50,6 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f ${TARGET} *.o *~ *.d cscope.* *.orig *.rej
+clean: generalclean
.PHONY: all ${TARGET}
--- cluster/gnbd/client/Makefile 2007/12/21 09:15:18 1.17
+++ cluster/gnbd/client/Makefile 2007/12/21 20:13:52 1.18
@@ -11,12 +11,13 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET1= gnbd_recvd
TARGET2= gnbd_monitor
+include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
OBJS1= gnbd_recvd.o
OBJS2= gnbd_monitor.o \
@@ -50,5 +51,4 @@
uninstall:
${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-clean:
- rm -f *.o *~ ${TARGET1} ${TARGET2}
+clean: generalclean
--- cluster/gnbd/man/Makefile 2007/12/21 18:37:16 1.6
+++ cluster/gnbd/man/Makefile 2007/12/21 20:13:52 1.7
@@ -11,11 +11,11 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/man.mk
-
TARGET= gnbd.8 \
gnbd_export.8 \
gnbd_import.8 \
gnbd_serv.8 \
fence_gnbd.8
+
+include ../../make/defines.mk
+include $(OBJDIR)/make/man.mk
--- cluster/gnbd/server/Makefile 2007/12/21 09:15:18 1.17
+++ cluster/gnbd/server/Makefile 2007/12/21 20:13:52 1.18
@@ -11,12 +11,13 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET1= gnbd_serv
TARGET2= gnbd_clusterd
+include ../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
OBJS1= gnbd_serv.o \
local_req.o \
extern_req.o \
@@ -55,5 +56,4 @@
uninstall:
${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-clean:
- rm -f *.o ${TARGET1} ${TARGET2}
+clean: generalclean
--- cluster/gnbd/tools/fence_gnbd/Makefile 2007/12/21 09:15:18 1.8
+++ cluster/gnbd/tools/fence_gnbd/Makefile 2007/12/21 20:13:52 1.9
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= fence_gnbd
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= fence_gnbd
+include $(OBJDIR)/make/clean.mk
OBJS= main.o
@@ -35,5 +36,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
--- cluster/gnbd/tools/gnbd_export/Makefile 2007/12/21 09:15:18 1.18
+++ cluster/gnbd/tools/gnbd_export/Makefile 2007/12/21 20:13:52 1.19
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= gnbd_export
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gnbd_export
+include $(OBJDIR)/make/clean.mk
OBJS= gnbd_export.o \
../../utils/gnbd_utils.o \
@@ -42,5 +43,4 @@
uninstall:
${UNINSTALL} ${TARGET} gnbd_get_uid ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
--- cluster/gnbd/tools/gnbd_import/Makefile 2007/12/21 09:15:19 1.15
+++ cluster/gnbd/tools/gnbd_import/Makefile 2007/12/21 20:13:52 1.16
@@ -11,10 +11,11 @@
###############################################################################
###############################################################################
+TARGET= gnbd_import
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gnbd_import
+include $(OBJDIR)/make/clean.mk
OBJS= gnbd_import.o \
../../utils/gnbd_utils.o \
@@ -42,5 +43,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
--- cluster/gnbd/utils/Makefile 2007/12/21 09:15:19 1.3
+++ cluster/gnbd/utils/Makefile 2007/12/21 20:13:53 1.4
@@ -13,6 +13,7 @@
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
SHAREDOBJS= member_cman.o \
trans.o \
@@ -27,5 +28,4 @@
uninstall:
-clean:
- rm -f *.o *~
+clean: generalclean
--- cluster/gnbd-kernel/src/Makefile 2007/12/21 09:05:34 1.8
+++ cluster/gnbd-kernel/src/Makefile 2007/12/21 20:13:53 1.9
@@ -13,6 +13,7 @@
ifndef USING_KBUILD
include ../../make/defines.mk
+include $(OBJDIR)/make/clean.mk
endif
PWD = $(shell pwd)
@@ -34,9 +35,6 @@
${UNINSTALL} gnbd.ko ${module_dir}/drivers/block/gnbd
${UNINSTALL} gnbd.h ${incdir}/linux
-clean:
- rm -rf linux *.mod.c .gnbd.ko.cmd \
- .tmp_versions *o .*.o.cmd *~ \
- Module.symvers .*.o.d
+clean: generalclean
distclean: clean
--- cluster/group/daemon/Makefile 2007/12/21 09:15:19 1.23
+++ cluster/group/daemon/Makefile 2007/12/21 20:13:53 1.24
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGET= groupd
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= groupd
+include $(OBJDIR)/make/clean.mk
OBJS= app.o \
cpg.o \
--- cluster/group/dlm_controld/Makefile 2007/12/21 09:15:19 1.14
+++ cluster/group/dlm_controld/Makefile 2007/12/21 20:13:53 1.15
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGET= dlm_controld
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= dlm_controld
+include $(OBJDIR)/make/clean.mk
OBJS= main.o \
member_cman.o \
@@ -45,7 +46,6 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
.PHONY: all ${TARGET}
--- cluster/group/gfs_controld/Makefile 2007/12/21 09:15:19 1.16
+++ cluster/group/gfs_controld/Makefile 2007/12/21 20:13:53 1.17
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGET= gfs_controld
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= gfs_controld
+include $(OBJDIR)/make/clean.mk
OBJS= main.o \
member_cman.o \
@@ -47,7 +48,6 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
.PHONY: all ${TARGET}
--- cluster/group/lib/Makefile 2007/12/21 09:15:19 1.10
+++ cluster/group/lib/Makefile 2007/12/21 20:13:54 1.11
@@ -10,10 +10,12 @@
###############################################################################
###############################################################################
+TARGET=libgroup
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
-TARGET=libgroup
STATICLIB=$(TARGET).a
CFLAGS += -fPIC
@@ -30,6 +32,4 @@
uninstall:
-clean:
- rm -f *.o *.a *.so *.so.*
- rm -f *~
+clean: generalclean
--- cluster/group/man/Makefile 2007/12/21 18:37:16 1.3
+++ cluster/group/man/Makefile 2007/12/21 20:13:54 1.4
@@ -10,10 +10,10 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/man.mk
-
TARGET= dlm_controld.8 \
gfs_controld.8 \
group_tool.8 \
groupd.8
+
+include ../../make/defines.mk
+include $(OBJDIR)/make/man.mk
--- cluster/group/test/Makefile 2007/12/21 09:15:20 1.5
+++ cluster/group/test/Makefile 2007/12/21 20:13:54 1.6
@@ -10,16 +10,15 @@
###############################################################################
###############################################################################
+TARGETS= client clientd
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGETS= client clientd
+include $(OBJDIR)/make/clean.mk
all: $(TARGETS)
%: %.o
$(CC) -o $@ $^ $(LDFLAGS)
-clean:
- rm -f *.o $(TARGETS)
-
+clean: generalclean
--- cluster/group/tool/Makefile 2007/12/21 09:15:20 1.13
+++ cluster/group/tool/Makefile 2007/12/21 20:13:54 1.14
@@ -10,10 +10,11 @@
###############################################################################
###############################################################################
+TARGET= group_tool
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
-
-TARGET= group_tool
+include $(OBJDIR)/make/clean.mk
OBJS= main.o
@@ -30,8 +31,7 @@
depends:
$(MAKE) -C ../lib all
-clean:
- rm -f *.o ${TARGET}
+clean: generalclean
install: all
install -d ${sbindir}
/cvs/cluster/cluster/make/clean.mk,v --> standard output
revision 1.1
--- cluster/make/clean.mk
+++ - 2007-12-21 20:14:05.741767000 +0000
@@ -0,0 +1,6 @@
+generalclean:
+ rm -rf *~* *.o *.a *.so *.so.* a.out *.po *.s *.d
+ rm -rf core .depend cscope.* *.orig *.rej
+ rm -rf linux .*.o.cmd .*.ko.cmd *.mod.c .tmp_versions Module.symvers .*.o.d
+ rm -rf ${TARGET} ${TARGETS} ${TARGET}_test
+ rm -rf ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6}
--- cluster/make/fenceperl.mk 2007/12/20 22:10:04 1.2
+++ cluster/make/fenceperl.mk 2007/12/21 20:13:54 1.3
@@ -1,15 +1,4 @@
-###############################################################################
-###############################################################################
-##
-## Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
-## Copyright (C) 2004 Red Hat, Inc. All rights reserved.
-##
-## This copyrighted material is made available to anyone wishing to use,
-## modify, copy, or redistribute it subject to the terms and conditions
-## of the GNU General Public License v.2.
-##
-###############################################################################
-###############################################################################
+include $(OBJDIR)/make/clean.mk
all: $(TARGET)
@@ -31,5 +20,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f $(TARGET)
+clean: generalclean
--- cluster/make/fencepy.mk 2007/12/20 22:10:04 1.2
+++ cluster/make/fencepy.mk 2007/12/21 20:13:54 1.3
@@ -1,3 +1,5 @@
+include $(OBJDIR)/make/clean.mk
+
all: $(TARGET)
$(TARGET):
@@ -18,5 +20,4 @@
uninstall:
${UNINSTALL} ${TARGET} ${sbindir}
-clean:
- rm -f $(TARGET)
+clean: generalclean
--- cluster/rgmanager/init.d/Makefile 2007/12/20 22:10:04 1.4
+++ cluster/rgmanager/init.d/Makefile 2007/12/21 20:13:55 1.5
@@ -10,10 +10,10 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-
TARGET= rgmanager
+include ../../make/defines.mk
+
all:
clean:
--- cluster/rgmanager/man/Makefile 2007/12/21 18:37:16 1.8
+++ cluster/rgmanager/man/Makefile 2007/12/21 20:13:55 1.9
@@ -11,9 +11,6 @@
###############################################################################
###############################################################################
-include ../../make/defines.mk
-include $(OBJDIR)/make/man.mk
-
TARGET= clubufflush.8 \
clufindhostname.8 \
clulog.8 \
@@ -22,4 +19,7 @@
clustat.8 \
clusvcadm.8
+include ../../make/defines.mk
+include $(OBJDIR)/make/man.mk
+
check:
--- cluster/rgmanager/src/clulib/Makefile 2007/12/21 09:15:21 1.21
+++ cluster/rgmanager/src/clulib/Makefile 2007/12/21 20:13:55 1.22
@@ -10,13 +10,14 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET1= libclulib.a
TARGET2= liblalloc.a
TARGET3= msgtest
+include ../../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
OBJS1= clulog.o daemon_init.o signals.o msgsimple.o \
gettid.o rg_strings.o message.o members.o fdops.o \
lock.o cman.o vft.o msg_cluster.o msg_socket.o \
@@ -52,5 +53,4 @@
${TARGET3}: ${OBJS3} ${TARGET1}
$(CC) -o $@ $^ $(LDFLAGS)
-clean:
- rm -f *.o ${TARGET1} ${TARGET2} ${TARGET3}
+clean: generalclean
--- cluster/rgmanager/src/daemons/Makefile 2007/12/21 09:15:21 1.28
+++ cluster/rgmanager/src/daemons/Makefile 2007/12/21 20:13:55 1.29
@@ -10,14 +10,15 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET1= clurgmgrd
TARGET2= clurmtabd
TARGET3= rg_test
TARGET4= dtest
+include ../../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
OBJS1= depends.o \
fo_domain.o \
groups.o \
@@ -121,8 +122,7 @@
uninstall:
${UNINSTALL} ${TARGET1} ${TARGET2} ${TARGET3} ${sbindir}
-clean:
- rm -f *.o ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4}
+clean: generalclean
rm -f tests/*.out*
.PHONY: all ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4}
--- cluster/rgmanager/src/utils/Makefile 2007/12/21 09:15:21 1.21
+++ cluster/rgmanager/src/utils/Makefile 2007/12/21 20:13:55 1.22
@@ -10,9 +10,6 @@
###############################################################################
###############################################################################
-include ../../../make/defines.mk
-include $(OBJDIR)/make/cobj.mk
-
TARGET1= clubufflush
TARGET2= clufindhostname
TARGET3= clustat
@@ -20,6 +17,10 @@
TARGET5= clulog
TARGET6= clunfslock
+include ../../../make/defines.mk
+include $(OBJDIR)/make/cobj.mk
+include $(OBJDIR)/make/clean.mk
+
DISABLEDTARGETS= cluarp
CFLAGS += -Werror -Wstrict-prototypes -Wshadow -fPIC -D_GNU_SOURCE
@@ -62,7 +63,6 @@
uninstall:
${UNINSTALL} ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6} ${sbindir}
-clean:
- rm -f *.o ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6}
+clean: generalclean
.PHONY: all ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6}
next reply other threads:[~2007-12-21 20:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-21 20:14 fabbione [this message]
-- strict thread matches above, loose matches on Subject: below --
2007-12-22 13:37 [Cluster-devel] cluster ccs/ccs_test/Makefile ccs/ccs_tool/Mak fabbione
2007-12-22 12:46 fabbione
2007-12-21 9:15 fabbione
2007-06-01 9:45 fabbione
2007-05-15 14:37 fabbione
2007-05-03 16:56 fabbione
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071221201406.11313.qmail@sourceware.org \
--to=fabbione@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.