FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Redhat > Cluster Development

 
 
LinkBack Thread Tools
 
Old 12-21-2007, 07:14 PM
 
Default cluster ccs/ccs_test/Makefile ccs/ccs_tool/Mak ...

CVSROOT: /cvs/cluster
Module name: cluster
Changes by: fabbione@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} ${sb
 
Old 12-22-2007, 11:46 AM
 
Default cluster ccs/ccs_test/Makefile ccs/ccs_tool/Mak ...

CVSROOT: /cvs/cluster
Module name: cluster
Changes by: fabbione@sourceware.org 2007-12-22 12:46:31

Modified files:
ccs/ccs_test : Makefile
ccs/ccs_tool : Makefile
ccs/daemon : Makefile
ccs/lib : Makefile
cman/cman_tool : Makefile
cman/daemon : Makefile
cman/init.d : Makefile
cman/lib : Makefile
cman/qdisk : Makefile
dlm/lib : Makefile
dlm/tool : Makefile
fence/agents/ipmilan: Makefile
fence/agents/manual: Makefile
fence/agents/rackswitch: Makefile
fence/agents/rps10: Makefile
fence/agents/scsi: Makefile
fence/agents/xvm: Makefile
fence/fence_node: Makefile
fence/fence_tool: Makefile
fence/fenced : 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-kernel/src/gfs: Makefile
gfs2/convert : Makefile
gfs2/edit : Makefile
gfs2/fsck : Makefile
gfs2/init.d : Makefile
gfs2/libgfs2 : Makefile
gfs2/mkfs : Makefile
gfs2/quota : Makefile
gfs2/tool : Makefile
gnbd/client : 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/tool : Makefile
make : fenceperl.mk fencepy.mk
rgmanager/init.d: Makefile
rgmanager/src/clulib: Makefile
rgmanager/src/daemons: Makefile
rgmanager/src/resources: Makefile
rgmanager/src/utils: Makefile
Added files:
make : install.mk uninstall.mk

Log message:
Collapse all install: and uninstall: targets in make/install.mk make/uninstall.mk

Change almost all Makefile's to use them.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_test/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_tool/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/lib/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/Makefile.diff?cvsroot=cluster&r1=1.28&r2=1.29
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/Makefile.diff?cvsroot=cluster&r1=1.59&r2=1.60
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/init.d/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/lib/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/lib/Makefile.diff?cvsroot=cluster&r1=1.25&r2=1.26
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tool/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.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/manual/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rackswitch/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rps10/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/scsi/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_node/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_tool/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_debug/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_edit/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_fsck/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_grow/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_jadd/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_mkfs/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_quota/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_tool/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/init.d/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/libgfs/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/convert/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/edit/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/fsck/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/init.d/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/Makefile.diff?cvsroot=cluster&r1=1.24&r2=1.25
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/quota/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/client/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/server/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/fence_gnbd/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_export/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_import/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/utils/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd-kernel/src/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/daemon/Makefile.diff?cvsroot=cluster&r1=1.25&r2=1.26
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/dlm_controld/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/lib/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/tool/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/install.mk.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/uninstall.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.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/fencepy.mk.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/init.d/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/clulib/Makefile.diff?cvsroot=cluster&r1=1.22&r2=1.23
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/Makefile.diff?cvsroot=cluster&r1=1.29&r2=1.30
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/Makefile.diff?cvsroot=cluster&r1=1.22&r2=1.23
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/Makefile.diff?cvsroot=cluster&r1=1.22&r2=1.23

--- cluster/ccs/ccs_test/Makefile 2007/12/21 20:13:43 1.12
+++ cluster/ccs/ccs_test/Makefile 2007/12/22 12:46:24 1.13
@@ -12,9 +12,13 @@

TARGET= ccs_test

+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= ccs_test.o

@@ -32,13 +36,6 @@
depends:
$(MAKE) -C ../lib all

-install: all
- install -d ${sbindir}
- install ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean

.PHONY: all ${TARGET}
--- cluster/ccs/ccs_tool/Makefile 2007/12/21 20:13:43 1.18
+++ cluster/ccs/ccs_tool/Makefile 2007/12/22 12:46:24 1.19
@@ -12,9 +12,13 @@

TARGET= ccs_tool

+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= ccs_tool.o
update.o
@@ -38,13 +42,6 @@
depends:
$(MAKE) -C ../lib all

-install: all
- install -d ${sbindir}
- install ccs_tool ${sbindir}
-
-uninstall:
- ${UNINSTALL} ccs_tool ${sbindir}
-
clean: generalclean

.PHONY: all ${TARGET}
--- cluster/ccs/daemon/Makefile 2007/12/21 20:13:43 1.20
+++ cluster/ccs/daemon/Makefile 2007/12/22 12:46:24 1.21
@@ -12,9 +12,13 @@

TARGET= ccsd

+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= ccsd.o
cnx_mgr.o
@@ -38,13 +42,6 @@
depends:
$(MAKE) -C ../lib all

-install: all
- install -d ${sbindir}
- install ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean

.PHONY: all ${TARGET}
--- cluster/ccs/lib/Makefile 2007/12/21 20:13:43 1.12
+++ cluster/ccs/lib/Makefile 2007/12/22 12:46:24 1.13
@@ -10,11 +10,16 @@
################################################## #############################
################################################## #############################

-TARGET=libccs.a
+TARGET= libccs.a
+
+LIBDIRT=$(TARGET)
+INCDIRT=ccs.h

include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= libccs.o
log.o
@@ -33,15 +38,5 @@
log.c:
ln -sf $(S)/../common/log.c log.c

-install: all
- install -d ${libdir}
- install -m644 ${TARGET} ${libdir}
- install -d ${incdir}
- install -m644 $(S)/ccs.h ${incdir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${libdir}
- ${UNINSTALL} ccs.h ${incdir}
-
clean: generalclean
rm -rf ccs.h.gch log.c
--- cluster/cman/cman_tool/Makefile 2007/12/21 20:13:43 1.28
+++ cluster/cman/cman_tool/Makefile 2007/12/22 12:46:24 1.29
@@ -12,9 +12,13 @@

TARGET= cman_tool

+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= main.o
join.o
@@ -33,11 +37,4 @@
depends:
$(MAKE) -C ../lib all

-install: all
- install -d ${sbindir}
- install ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/cman/daemon/Makefile 2007/12/21 20:13:43 1.59
+++ cluster/cman/daemon/Makefile 2007/12/22 12:46:24 1.60
@@ -12,9 +12,13 @@

TARGET= service_cman.lcrso

+LCRSOT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

CFLAGS += -DOPENAIS_EXTERNAL_SERVICE
CFLAGS += -fPIC
@@ -39,11 +43,4 @@
depends:
$(MAKE) -C ../lib all

-install: all
- install -d ${libexecdir}/lcrso
- install ${TARGET} ${libexecdir}/lcrso
-
-uninstall:
- rm -f ${libexecdir}/lcrso/${TARGET}
-
clean: generalclean
--- cluster/cman/init.d/Makefile 2007/12/21 20:13:43 1.6
+++ cluster/cman/init.d/Makefile 2007/12/22 12:46:25 1.7
@@ -12,15 +12,12 @@

TARGETS= cman qdiskd

+INITDT=$(TARGETS)
+
include ../../make/defines.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

all:

clean:
-
-install:
- install -d ${DESTDIR}/etc/init.d
- install $(S)/cman $(S)/qdiskd ${DESTDIR}/etc/init.d
-
-uninstall:
- ${UNINSTALL} ${TARGETS} ${DESTDIR}/etc/init.d
--- cluster/cman/lib/Makefile 2007/12/21 20:13:44 1.14
+++ cluster/cman/lib/Makefile 2007/12/22 12:46:25 1.15
@@ -11,11 +11,21 @@
################################################## #############################
################################################## #############################

-TARGET=libcman
+TARGET= libcman
+
+LIBDIRT=$(TARGET).a
+ $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR)
+
+LIBSYMT=$(TARGET).so
+ $(TARGET).so.$(RELEASE_MAJOR)
+
+INCDIRT=$(TARGET).h

include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_ MINOR}
STATICLIB=$(TARGET).a
@@ -35,21 +45,4 @@
ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) $(TARGET).so
ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) $(TARGET).so.$(RELEASE_MAJOR)

-install: all
- install -d ${incdir}
- install $(S)/$(TARGET).h ${incdir}
- install -d ${libdir}
- install $(TARGET).a ${libdir}
- install $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}
- ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}/$(TARGET).so
- ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}/$(TARGET).so.$(RELEASE_MAJOR)
-
-uninstall:
- ${UNINSTALL} $(TARGET).h ${incdir}
- ${UNINSTALL}
- ${TARGET}.a
- $(TARGET).so
- $(TARGET).so.$(RELEASE_MAJOR)
- ${TARGET}.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}
-
clean: generalclean
--- cluster/cman/qdisk/Makefile 2007/12/21 20:13:44 1.16
+++ cluster/cman/qdisk/Makefile 2007/12/22 12:46:25 1.17
@@ -13,9 +13,13 @@
TARGET1= qdiskd
TARGET2= mkqdisk

+SBINDIRT=${TARGET1} ${TARGET2}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

CFLAGS += -D_GNU_SOURCE
CFLAGS += -Werror -Wstrict-prototypes -Wshadow
@@ -48,14 +52,7 @@
${TARGET2}: ${SHAREDOBJS} ${OBJS2}
$(CC) -o $@ $^ $(LDFLAGS)

-install: all
- install -d ${sbindir}
- install ${TARGET1} ${TARGET2} ${sbindir}
-
depends:
$(MAKE) -C ../lib all

clean: generalclean
-
-uninstall:
- ${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
--- cluster/dlm/lib/Makefile 2007/12/21 20:13:44 1.25
+++ cluster/dlm/lib/Makefile 2007/12/22 12:46:25 1.26
@@ -12,11 +12,28 @@
################################################## #############################

TARGET= libdlm
-AISTARGET= libaislock
+
+LIBDIRT=$(TARGET).a
+ $(TARGET)_lt.a
+ $(TARGET).so.${RELEASE_MAJOR}.${RELEASE_MINOR}
+ $(TARGET)_lt.so.${RELEASE_MAJOR}.${RELEASE_MINOR}
+
+LIBSYMT=$(TARGET).so
+ $(TARGET)_lt.so
+ $(TARGET).so.$(RELEASE_MAJOR)
+ $(TARGET)_lt.so.$(RELEASE_MAJOR)
+
+INCDIRT=$(TARGET).h
+
+UDEVT=../scripts/51-dlm.rules

include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
+
+AISTARGET= libaislock

SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_ MINOR} $(TARGET)_lt.so.${RELEASE_MAJOR}.${RELEASE_MINOR}
STATICLIB=$(TARGET).a $(TARGET)_lt.a
@@ -59,32 +76,4 @@
%.po: $(S)/%.c
$(CC) $(CFLAGS) -fPIC -D_REENTRANT -c -o $@ $<

-install: all
- install -d ${incdir}
- install -m644 $(S)/$(TARGET).h ${incdir}
- install -d ${libdir}
- install -d ${DESTDIR}/etc/udev/rules.d
- install -m644 $(S)/../scripts/51-dlm.rules ${DESTDIR}/etc/udev/rules.d
- install $(TARGET).a ${libdir}
- install $(TARGET)_lt.a ${libdir}
- install $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}
- install $(TARGET)_lt.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}
- ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}/$(TARGET).so
- ln -sf $(TARGET).so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}/$(TARGET).so.$(RELEASE_MAJOR)
- ln -sf $(TARGET)_lt.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}/$(TARGET)_lt.so
- ln -sf $(TARGET)_lt.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}/$(TARGET)_lt.so.$(RELEASE_MAJOR)
-
-uninstall:
- ${UNINSTALL} $(TARGET).h ${incdir}
- ${UNINSTALL} 51-dlm.rules ${DESTDIR}/etc/udev/rules.d
- ${UNINSTALL}
- ${TARGET}.a
- ${TARGET}_lt.a
- $(TARGET).so
- $(TARGET)_lt.so
- $(TARGET).so.$(RELEASE_MAJOR)
- ${TARGET}.so.$(RELEASE_MAJOR).$(RELEASE_MINOR)
- $(TARGET)_lt.so.$(RELEASE_MAJOR)
- ${TARGET}_lt.so.$(RELEASE_MAJOR).$(RELEASE_MINOR) ${libdir}
-
clean: generalclean
--- cluster/dlm/tool/Makefile 2007/12/21 20:13:45 1.7
+++ cluster/dlm/tool/Makefile 2007/12/22 12:46:25 1.8
@@ -12,9 +12,13 @@

TARGET= dlm_tool

+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= main.o

@@ -30,10 +34,3 @@
$(CC) -o $@ $^ $(LDFLAGS)

clean: generalclean
-
-install: all
- install -d ${sbindir}
- install ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
--- cluster/fence/agents/ipmilan/Makefile 2007/12/21 20:13:46 1.11
+++ cluster/fence/agents/ipmilan/Makefile 2007/12/22 12:46:25 1.12
@@ -13,9 +13,13 @@

TARGET= fence_ipmilan

+SBINDIRT=$(TARGET)
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= expect.o
ipmilan.o
@@ -27,13 +31,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/fence/agents/manual/Makefile 2007/12/21 20:13:46 1.13
+++ cluster/fence/agents/manual/Makefile 2007/12/22 12:46:25 1.14
@@ -13,24 +13,19 @@

TARGET= fence_ack_manual

+SBINDIRT=$(TARGET)
+
include ../../../make/defines.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

all: ${TARGET}

# Using manual override instead of the binary version.
# (this version does not require any configuration params
# in cluster.conf, but fencing must fail first)
-fence_ack_manual: $(S)/fence_ack_manual.sh
- cp $< $@
-
-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
+${TARGET}:
+ cp $(S)/$@.sh $@

clean: generalclean
--- cluster/fence/agents/rackswitch/Makefile 2007/12/21 20:13:46 1.9
+++ cluster/fence/agents/rackswitch/Makefile 2007/12/22 12:46:26 1.10
@@ -13,9 +13,13 @@

TARGET= fence_rackswitch

+SBINDIRT=$(TARGET)
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= do_rack.o

@@ -26,13 +30,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/fence/agents/rps10/Makefile 2007/12/21 20:13:47 1.9
+++ cluster/fence/agents/rps10/Makefile 2007/12/22 12:46:26 1.10
@@ -13,9 +13,13 @@

TARGET= fence_rps10

+SBINDIRT=$(TARGET)
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

TARGET= fence_rps10

@@ -28,13 +32,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/fence/agents/scsi/Makefile 2007/12/21 20:13:47 1.16
+++ cluster/fence/agents/scsi/Makefile 2007/12/22 12:46:26 1.17
@@ -11,10 +11,14 @@
################################################## #############################

TARGET= fence_scsi
-SCRIPT= scsi_reserve
+
+SBINDIRT=$(TARGET) $(TARGET)_test
+INITDT= scsi_reserve

include ../../../make/defines.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

all: $(TARGET) $(TARGET)_test

@@ -36,18 +40,4 @@
awk -v p=0 "($$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(S)/$(TARGET)_test.pl >> $(TARGET)_test
chmod +x $(TARGET)_test

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET} ${TARGET}_test ${sbindir}
- if [ ! -d ${DESTDIR}/etc/init.d ]; then
- install -d ${DESTDIR}/etc/init.d;
- fi
- install -m755 $(S)/${SCRIPT} ${DESTDIR}/etc/init.d
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${TARGET}_test ${sbindir}
- ${UNINSTALL} ${SCRIPT} ${DESTDIR}/etc/init.d
-
clean: generalclean
--- cluster/fence/agents/xvm/Makefile 2007/12/21 20:13:48 1.18
+++ cluster/fence/agents/xvm/Makefile 2007/12/22 12:46:26 1.19
@@ -14,9 +14,13 @@
TARGET2= fence_xvmd
TARGET3= testprog

+SBINDIRT=$(TARGET1) $(TARGET2)
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS1= fence_xvm.o
ip_lookup.o
@@ -63,12 +67,3 @@
$(CC) -o $@ $^ $(XML_LDFLAGS)

clean: generalclean
-
-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET1} ${TARGET2} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
--- cluster/fence/fence_node/Makefile 2007/12/21 20:13:48 1.13
+++ cluster/fence/fence_node/Makefile 2007/12/22 12:46:26 1.14
@@ -13,9 +13,13 @@

TARGET = fence_node

+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= ../fenced/agent.o
fence_node.o
@@ -33,13 +37,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/fence/fence_tool/Makefile 2007/12/21 20:13:49 1.20
+++ cluster/fence/fence_tool/Makefile 2007/12/22 12:46:26 1.21
@@ -13,9 +13,13 @@

TARGET = fence_tool

+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= ../fenced/agent.o
fence_tool.o
@@ -33,13 +37,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/fence/fenced/Makefile 2007/12/21 20:13:49 1.16
+++ cluster/fence/fenced/Makefile 2007/12/22 12:46:26 1.17
@@ -13,9 +13,13 @@

TARGET = fenced

+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= main.o
recover.o
@@ -36,13 +40,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/gfs/gfs_debug/Makefile 2007/12/21 20:13:49 1.13
+++ cluster/gfs/gfs_debug/Makefile 2007/12/22 12:46:26 1.14
@@ -13,9 +13,13 @@

TARGET= gfs_debug

+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= block_device.o
basic.o
@@ -34,13 +38,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/gfs/gfs_edit/Makefile 2007/12/21 20:13:49 1.13
+++ cluster/gfs/gfs_edit/Makefile 2007/12/22 12:46:26 1.14
@@ -13,9 +13,13 @@

TARGET= gfs_edit

+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= gfshex.o
hexedit.o
@@ -32,13 +36,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/gfs/gfs_fsck/Makefile 2007/12/21 20:13:49 1.16
+++ cluster/gfs/gfs_fsck/Makefile 2007/12/22 12:46:27 1.17
@@ -13,9 +13,14 @@
TARGET1= gfs_fsck
TARGET2= fsck.gfs

+SBINDIRT=$(TARGET1)
+SBINSYMT=$(TARGET2)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= bio.o
bitmap.o
@@ -70,16 +75,6 @@
clean: generalclean
rm -f test_block_list test_bitmap

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET1} ${sbindir}
- cd ${sbindir}; ln -sf ${TARGET1} ${TARGET2}
-
-uninstall:
- ${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-
${TARGET1}.pot: $(OBJS:.o=.c)
xgettext -C -F --keyword=print_log --keyword=log_debug --keyword=log_info --keyword=_
--keyword=log_notice --keyword=log_warn --keyword=log_err --keyword=log_crit
--- cluster/gfs/gfs_grow/Makefile 2007/12/21 20:13:49 1.14
+++ cluster/gfs/gfs_grow/Makefile 2007/12/22 12:46:27 1.15
@@ -13,9 +13,13 @@

TARGET= gfs_grow

+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= main.o
ondisk.o
@@ -35,15 +39,6 @@
depends:
$(MAKE) -C ../libgfs all

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean

.PHONY: all ${TARGET}
--- cluster/gfs/gfs_jadd/Makefile 2007/12/21 20:13:50 1.14
+++ cluster/gfs/gfs_jadd/Makefile 2007/12/22 12:46:27 1.15
@@ -13,9 +13,13 @@

TARGET= gfs_jadd

+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= main.o
ondisk.o
@@ -35,15 +39,6 @@
depends:
$(MAKE) -C ../libgfs all

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean

.PHONY: all ${TARGET}
--- cluster/gfs/gfs_mkfs/Makefile 2007/12/21 20:13:50 1.15
+++ cluster/gfs/gfs_mkfs/Makefile 2007/12/22 12:46:27 1.16
@@ -14,9 +14,14 @@
TARGET1= gfs_mkfs
TARGET2= mkfs.gfs

+SBINDIRT=$(TARGET1)
+SBINSYMT=$(TARGET2)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= device_geometry.o
fs_geometry.o
@@ -44,16 +49,6 @@
depends:
$(MAKE) -C ../libgfs all

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET1} ${sbindir}
- ln -f ${sbindir}/${TARGET1} ${sbindir}/${TARGET2}
-
-uninstall:
- ${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-
clean: generalclean

.PHONY: all ${TARGET1}
--- cluster/gfs/gfs_quota/Makefile 2007/12/21 20:13:50 1.14
+++ cluster/gfs/gfs_quota/Makefile 2007/12/22 12:46:27 1.15
@@ -13,9 +13,13 @@

TARGET= gfs_quota

+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= check.o
main.o
@@ -33,13 +37,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/gfs/gfs_tool/Makefile 2007/12/21 20:13:50 1.18
+++ cluster/gfs/gfs_tool/Makefile 2007/12/22 12:46:27 1.19
@@ -13,9 +13,13 @@

TARGET= gfs_tool

+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= counters.o
df.o
@@ -37,13 +41,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/gfs/init.d/Makefile 2007/12/21 20:13:50 1.6
+++ cluster/gfs/init.d/Makefile 2007/12/22 12:46:27 1.7
@@ -12,15 +12,12 @@

TARGET= gfs

+INITDT=$(TARGET)
+
include ../../make/defines.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

all:

clean:
-
-install:
- install -d ${DESTDIR}/etc/init.d
- install $(S)/${TARGET} ${DESTDIR}/etc/init.d
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${DESTDIR}/etc/init.d
--- cluster/gfs/libgfs/Makefile 2007/12/21 20:13:50 1.14
+++ cluster/gfs/libgfs/Makefile 2007/12/22 12:46:27 1.15
@@ -16,6 +16,8 @@
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
CFLAGS += -D_GNU_SOURCE -DHELPER_PROGRAM
@@ -46,10 +48,6 @@
${AR} cru $@ $^
${RANLIB} $@

-install: all
-
-uninstall:
-
clean: generalclean

.PHONY: all
--- cluster/gfs-kernel/src/gfs/Makefile 2007/12/22 05:10:49 1.20
+++ cluster/gfs-kernel/src/gfs/Makefile 2007/12/22 12:46:27 1.21
@@ -11,9 +11,17 @@
################################################## #############################
################################################## #############################

+TARGET= gfs.ko
+
+KMODT=$(TARGET)
+KDIRT=fs/gfs
+KHEADT=gfs_ondisk.h gfs_ioctl.h
+
ifndef USING_KBUILD
include ../../../make/defines.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
endif

PWD := $(shell pwd)
@@ -63,14 +71,4 @@
all:
${MAKE} -C ${KERNEL_BUILD} M=${PWD} symverfile=${SYMVERFILE} modules USING_KBUILD=yes

-install: all
- install -d ${module_dir}/fs/gfs
- install gfs.ko ${module_dir}/fs/gfs
- install -d ${incdir}/linux
- install gfs_ondisk.h gfs_ioctl.h ${incdir}/linux
-
-uninstall:
- ${UNINSTALL} gfs.ko ${module_dir}/fs/gfs
- ${UNINSTALL} gfs_ondisk.h gfs_ioctl.h ${incdir}/linux
-
clean: generalclean
--- cluster/gfs2/convert/Makefile 2007/12/21 20:13:51 1.15
+++ cluster/gfs2/convert/Makefile 2007/12/22 12:46:28 1.16
@@ -12,9 +12,13 @@

TARGET= gfs2_convert

+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= gfs2_convert.o

@@ -33,15 +37,6 @@
depends:
$(MAKE) -C ../libgfs2 all

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean

.PHONY: all ${TARGET}
--- cluster/gfs2/edit/Makefile 2007/12/21 20:13:51 1.15
+++ cluster/gfs2/edit/Makefile 2007/12/22 12:46:28 1.16
@@ -13,9 +13,13 @@

TARGET= gfs2_edit

+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= gfs2hex.o
savemeta.o
@@ -38,15 +42,6 @@
depends:
$(MAKE) -C ../libgfs2 all

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean

.PHONY: all ${TARGET}
--- cluster/gfs2/fsck/Makefile 2007/12/21 20:13:51 1.19
+++ cluster/gfs2/fsck/Makefile 2007/12/22 12:46:28 1.20
@@ -13,9 +13,14 @@
TARGET1= fsck.gfs2
TARGET2= gfs2_fsck

+SBINDIRT=$(TARGET1)
+SBINSYMT=$(TARGET2)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= eattr.o
fs_recovery.o
@@ -64,16 +69,6 @@
clean: generalclean
rm -f test_block_list test_bitmap

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET1} ${sbindir}
- cd ${sbindir}; ln -sf ${TARGET1} ${TARGET2}
-
-uninstall:
- ${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-
${TARGET1}.pot: $(OBJS:.o=.c)
xgettext -C -F --keyword=print_log --keyword=log_debug --keyword=log_info --keyword=_
--keyword=log_notice --keyword=log_warn --keyword=log_err --keyword=log_crit
--- cluster/gfs2/init.d/Makefile 2007/12/21 20:13:51 1.6
+++ cluster/gfs2/init.d/Makefile 2007/12/22 12:46:28 1.7
@@ -12,15 +12,12 @@

TARGET= gfs2

+INITDT=$(TARGET)
+
include ../../make/defines.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

all:

clean:
-
-install:
- install -d ${DESTDIR}/etc/init.d
- install $(S)/${TARGET} ${DESTDIR}/etc/init.d
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${DESTDIR}/etc/init.d
--- cluster/gfs2/libgfs2/Makefile 2007/12/21 20:13:51 1.16
+++ cluster/gfs2/libgfs2/Makefile 2007/12/22 12:46:28 1.17
@@ -16,6 +16,8 @@
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
@@ -45,10 +47,6 @@
${AR} cru $@ $^
${RANLIB} $@

-install: all
-
-uninstall:
-
clean: generalclean

.PHONY: all
--- cluster/gfs2/mkfs/Makefile 2007/12/21 20:13:51 1.24
+++ cluster/gfs2/mkfs/Makefile 2007/12/22 12:46:28 1.25
@@ -8,9 +8,14 @@
TARGET3= gfs2_jadd
TARGET4= gfs2_grow

+SBINDIRT=$(TARGET1)
+SBINSYMT=$(TARGET2) $(TARGET3) $(TARGET4)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= main.o
main_mkfs.o
@@ -42,16 +47,6 @@
depends:
$(MAKE) -C ../libgfs2 all

-install: all
- install -m 0755 ${TARGET1} ${sbindir}
- cd ${sbindir};
- ln -sf ${TARGET1} ${TARGET2};
- ln -sf ${TARGET1} ${TARGET3};
- ln -sf ${TARGET1} ${TARGET4}
-
-uninstall:
- ${UNINSTALL} ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${sbindir}
-
clean: generalclean

.PHONY: all ${TARGET1}
--- cluster/gfs2/quota/Makefile 2007/12/21 20:13:52 1.16
+++ cluster/gfs2/quota/Makefile 2007/12/22 12:46:28 1.17
@@ -13,9 +13,13 @@

TARGET= gfs2_quota

+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= main.o
names.o
@@ -36,12 +40,6 @@
depends:
$(MAKE) -C ../libgfs2 all

-install: all
- install -m 0755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean

.PHONY: all ${TARGET}
--- cluster/gfs2/tool/Makefile 2007/12/21 20:13:52 1.18
+++ cluster/gfs2/tool/Makefile 2007/12/22 12:46:28 1.19
@@ -13,9 +13,13 @@

TARGET= gfs2_tool

+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= counters.o
df.o
@@ -41,15 +45,6 @@
depends:
$(MAKE) -C ../libgfs2 all

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean

.PHONY: all ${TARGET}
--- cluster/gnbd/client/Makefile 2007/12/21 20:13:52 1.18
+++ cluster/gnbd/client/Makefile 2007/12/22 12:46:28 1.19
@@ -14,9 +14,13 @@
TARGET1= gnbd_recvd
TARGET2= gnbd_monitor

+SBINDIRT=$(TARGET1) $(TARGET2)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS1= gnbd_recvd.o

@@ -41,14 +45,4 @@
${TARGET2}: ${SHAREDOBJS} ${OBJS2}
$(CC) -o $@ $^ $(LDFLAGS)

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET1} ${sbindir}
- install -m755 ${TARGET2} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-
clean: generalclean
--- cluster/gnbd/server/Makefile 2007/12/21 20:13:52 1.18
+++ cluster/gnbd/server/Makefile 2007/12/22 12:46:29 1.19
@@ -14,9 +14,13 @@
TARGET1= gnbd_serv
TARGET2= gnbd_clusterd

+SBINDIRT=$(TARGET1) $(TARGET2)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS1= gnbd_serv.o
local_req.o
@@ -46,14 +50,4 @@
${TARGET2}: ${SHAREDOBJS} ${OBJS2}
$(CC) -o $@ $^ $(LDFLAGS)

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET1} ${sbindir}
- install -m755 ${TARGET2} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET1} ${TARGET2} ${sbindir}
-
clean: generalclean
--- cluster/gnbd/tools/fence_gnbd/Makefile 2007/12/21 20:13:52 1.9
+++ cluster/gnbd/tools/fence_gnbd/Makefile 2007/12/22 12:46:29 1.10
@@ -13,9 +13,13 @@

TARGET= fence_gnbd

+SBINDIRT=$(TARGET)
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= main.o

@@ -27,13 +31,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/gnbd/tools/gnbd_export/Makefile 2007/12/21 20:13:52 1.19
+++ cluster/gnbd/tools/gnbd_export/Makefile 2007/12/22 12:46:29 1.20
@@ -13,9 +13,13 @@

TARGET= gnbd_export

+SBINDIRT=$(TARGET) gnbd_get_uid
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= gnbd_export.o
../../utils/gnbd_utils.o
@@ -28,19 +32,12 @@

LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread

-all: ${TARGET}
+all: ${TARGET} gnbd_get_uid

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET} ${sbindir}
- install -m755 $(S)/gnbd_get_uid ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} gnbd_get_uid ${sbindir}
+gnbd_get_uid:
+ cp $(S)/$@ $@

clean: generalclean
--- cluster/gnbd/tools/gnbd_import/Makefile 2007/12/21 20:13:52 1.16
+++ cluster/gnbd/tools/gnbd_import/Makefile 2007/12/22 12:46:29 1.17
@@ -13,9 +13,13 @@

TARGET= gnbd_import

+SBINDIRT=$(TARGET)
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= gnbd_import.o
../../utils/gnbd_utils.o
@@ -34,13 +38,4 @@
${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/gnbd/utils/Makefile 2007/12/21 20:13:53 1.4
+++ cluster/gnbd/utils/Makefile 2007/12/22 12:46:29 1.5
@@ -14,6 +14,8 @@
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

SHAREDOBJS= member_cman.o
trans.o
@@ -24,8 +26,4 @@

all: ${SHAREDOBJS}

-install:
-
-uninstall:
-
clean: generalclean
--- cluster/gnbd-kernel/src/Makefile 2007/12/22 05:10:49 1.10
+++ cluster/gnbd-kernel/src/Makefile 2007/12/22 12:46:29 1.11
@@ -11,9 +11,17 @@
################################################## #############################
################################################## #############################

+TARGET= gnbd.ko
+
+KMODT=$(TARGET)
+KDIRT=drivers/block/gnbd
+KHEADT=gnbd.h
+
ifndef USING_KBUILD
include ../../make/defines.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
endif

PWD = $(shell pwd)
@@ -25,14 +33,4 @@
all:
${MAKE} -C ${KERNEL_BUILD} M=${PWD} symverfile=${SYMVERFILE} modules USING_KBUILD=yes

-install: all
- install -d ${incdir}/linux
- install gnbd.h ${incdir}/linux
- install -d ${module_dir}/drivers/block/gnbd
- install gnbd.ko ${module_dir}/drivers/block/gnbd
-
-uninstall:
- ${UNINSTALL} gnbd.ko ${module_dir}/drivers/block/gnbd
- ${UNINSTALL} gnbd.h ${incdir}/linux
-
clean: generalclean
--- cluster/group/daemon/Makefile 2007/12/22 12:18:54 1.25
+++ cluster/group/daemon/Makefile 2007/12/22 12:46:29 1.26
@@ -12,9 +12,13 @@

TARGET= groupd

+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= app.o
cpg.o
@@ -34,11 +38,3 @@
$(CC) -o $@ $^ $(LDFLAGS)

clean: generalclean
-
-install: all
- install -d ${sbindir}
- install ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
--- cluster/group/dlm_controld/Makefile 2007/12/21 20:13:53 1.15
+++ cluster/group/dlm_controld/Makefile 2007/12/22 12:46:29 1.16
@@ -12,9 +12,13 @@

TARGET= dlm_controld

+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= main.o
member_cman.o
@@ -39,13 +43,6 @@
depends:
$(MAKE) -C ../lib all

-install: all
- install -d ${sbindir}
- install ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean

.PHONY: all ${TARGET}
--- cluster/group/gfs_controld/Makefile 2007/12/21 20:13:53 1.17
+++ cluster/group/gfs_controld/Makefile 2007/12/22 12:46:29 1.18
@@ -12,9 +12,13 @@

TARGET= gfs_controld

+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= main.o
member_cman.o
@@ -41,13 +45,6 @@
depends:
$(MAKE) -C ../lib all

-install: all
- install -d ${sbindir}
- install ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean

.PHONY: all ${TARGET}
--- cluster/group/lib/Makefile 2007/12/21 20:13:54 1.11
+++ cluster/group/lib/Makefile 2007/12/22 12:46:29 1.12
@@ -15,6 +15,8 @@
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

STATICLIB=$(TARGET).a

@@ -28,8 +30,4 @@
${AR} r $@ $^
${RANLIB} $@

-install: all
-
-uninstall:
-
clean: generalclean
--- cluster/group/tool/Makefile 2007/12/21 20:13:54 1.14
+++ cluster/group/tool/Makefile 2007/12/22 12:46:30 1.15
@@ -12,9 +12,13 @@

TARGET= group_tool

+SBINDIRT=$(TARGET)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS= main.o

@@ -33,11 +37,4 @@

clean: generalclean

-install: all
- install -d ${sbindir}
- install ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
.PHONY: all ${TARGET}
/cvs/cluster/cluster/make/install.mk,v --> standard output
revision 1.1
--- cluster/make/install.mk
+++ - 2007-12-22 12:46:36.187963000 +0000
@@ -0,0 +1,45 @@
+install: all
+ifdef LIBDIRT
+ install -d ${libdir}
+ install -m644 ${LIBDIRT} ${libdir}
+endif
+ifdef LIBSYMT
+ cp -a ${LIBSYMT} ${libdir}
+endif
+ifdef INCDIRT
+ install -d ${incdir}
+ for i in ${INCDIRT}; do
+ install -m644 $(S)/$$i ${incdir};
+ done
+endif
+ifdef SBINDIRT
+ install -d ${sbindir}
+ install -m755 ${SBINDIRT} ${sbindir}
+endif
+ifdef SBINSYMT
+ cp -a ${SBINSYMT} ${sbindir}
+endif
+ifdef LCRSOT
+ install -d ${libexecdir}/lcrso
+ install -m644 ${LCRSOT} ${libexecdir}/lcrso
+endif
+ifdef INITDT
+ install -d ${DESTDIR}/etc/init.d
+ for i in ${INITDT}; do
+ install -m755 $(S)/$$i ${DESTDIR}/etc/init.d;
+ done
+endif
+ifdef UDEVT
+ install -d ${DESTDIR}/etc/udev/rules.d
+ for i in ${UDEVT}; do
+ install -m644 $(S)/$$i ${DESTDIR}/etc/udev/rules.d;
+ done
+endif
+ifdef KMODT
+ install -d ${module_dir}/${KDIRT}
+ install -m644 ${KMODT} ${module_dir}/${KDIRT}
+endif
+ifdef KHEADT
+ install -d ${incdir}/linux
+ install -m644 ${KHEADT} ${incdir}/linux
+endif
/cvs/cluster/cluster/make/uninstall.mk,v --> standard output
revision 1.1
--- cluster/make/uninstall.mk
+++ - 2007-12-22 12:46:36.267099000 +0000
@@ -0,0 +1,31 @@
+uninstall:
+ifdef LIBDIRT
+ ${UNINSTALL} ${LIBDIRT} ${libdir}
+endif
+ifdef LIBSYMT
+ ${UNINSTALL} ${LIBSYMT} ${libdir}
+endif
+ifdef INCDIRT
+ ${UNINSTALL} ${INCDIRT} ${incdir}
+endif
+ifdef SBINDIRT
+ ${UNINSTALL} ${SBINDIRT} ${sbindir}
+endif
+ifdef SBINSYMT
+ ${UNINSTALL} ${SBINDIRT} ${sbindir}
+endif
+ifdef LCRSOT
+ ${UNINSTALL} ${LCRSOT} ${libexecdir}/lcrso
+endif
+ifdef INITDT
+ ${UNINSTALL} ${INITDT} ${DESTDIR}/etc/init.d
+endif
+ifdef UDEVT
+ ${UNINSTALL} ${UDEVT} {DESTDIR}/etc/udev/rules.d
+endif
+ifdef KMODT
+ ${UNINSTALL} ${KMODT} ${module_dir}/${KDIRT}
+endif
+ifdef KHEADT
+ ${UNINSTALL} ${KHEADT} ${incdir}/linux
+endif
--- cluster/make/fenceperl.mk 2007/12/21 20:13:54 1.3
+++ cluster/make/fenceperl.mk 2007/12/22 12:46:30 1.4
@@ -1,4 +1,8 @@
+SBINDIRT=$(TARGET)
+
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

all: $(TARGET)

@@ -11,13 +15,4 @@
awk -v p=0 "($$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(S)/$(TARGET).pl >> $(TARGET)
chmod +x $(TARGET)

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/make/fencepy.mk 2007/12/21 20:13:54 1.3
+++ cluster/make/fencepy.mk 2007/12/22 12:46:30 1.4
@@ -1,4 +1,8 @@
+SBINDIRT=$(TARGET)
+
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

all: $(TARGET)

@@ -11,13 +15,4 @@
awk -v p=0 "($$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(S)/$(TARGET).py >> $(TARGET)
chmod +x $(TARGET)

-install: all
- if [ ! -d ${sbindir} ]; then
- install -d ${sbindir};
- fi
- install -m755 ${TARGET} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${sbindir}
-
clean: generalclean
--- cluster/rgmanager/init.d/Makefile 2007/12/21 20:13:55 1.5
+++ cluster/rgmanager/init.d/Makefile 2007/12/22 12:46:30 1.6
@@ -12,17 +12,14 @@

TARGET= rgmanager

+INITDT=$(TARGET)
+
include ../../make/defines.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

all:

clean:

check:
-
-install:
- install -d ${DESTDIR}/etc/init.d
- install $(S)/${TARGET} ${DESTDIR}/etc/init.d
-
-uninstall:
- ${UNINSTALL} ${TARGET} ${DESTDIR}/etc/init.d
--- cluster/rgmanager/src/clulib/Makefile 2007/12/21 20:13:55 1.22
+++ cluster/rgmanager/src/clulib/Makefile 2007/12/22 12:46:30 1.23
@@ -17,6 +17,8 @@
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS1= clulog.o daemon_init.o signals.o msgsimple.o
gettid.o rg_strings.o message.o members.o fdops.o
@@ -38,10 +40,6 @@

all: ${TARGET1} ${TARGET2} ${TARGET3}

-install: all
-
-uninstall:
-
${TARGET1}: ${OBJS1}
${AR} cru $@ $^
${RANLIB} $@
--- cluster/rgmanager/src/daemons/Makefile 2007/12/21 20:13:55 1.29
+++ cluster/rgmanager/src/daemons/Makefile 2007/12/22 12:46:30 1.30
@@ -15,9 +15,13 @@
TARGET3= rg_test
TARGET4= dtest

+SBINDIRT=$(TARGET1) $(TARGET2) $(TARGET3)
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

OBJS1= depends.o
fo_domain.o
@@ -115,13 +119,6 @@
depends:
$(MAKE) -C ../clulib all

-install: all
- install -d ${sbindir}
- install -m755 ${TARGET1} ${TARGET2} ${TARGET3} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET1} ${TARGET2} ${TARGET3} ${sbindir}
-
clean: generalclean
rm -f tests/*.out*

--- cluster/rgmanager/src/resources/Makefile 2007/12/20 22:10:05 1.22
+++ cluster/rgmanager/src/resources/Makefile 2007/12/22 12:46:30 1.23
@@ -32,9 +32,6 @@
all:

install: all
- echo ${sharedir}
- echo ${sbindir}
- install -d ${sharedir}
install -d ${sharedir}/utils
for i in $(RESOURCES); do
install $(S)/$$i ${sharedir};
--- cluster/rgmanager/src/utils/Makefile 2007/12/21 20:13:55 1.22
+++ cluster/rgmanager/src/utils/Makefile 2007/12/22 12:46:30 1.23
@@ -17,9 +17,13 @@
TARGET5= clulog
TARGET6= clunfslock

+SBINDIRT=$(TARGET1) $(TARGET2) $(TARGET3) $(TARGET4) $(TARGET5) $(TARGET6)
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk

DISABLEDTARGETS= cluarp

@@ -56,13 +60,6 @@
depends:
$(MAKE) -C ../clulib all

-install: all
- install -d ${sbindir}
- install ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6} ${sbindir}
-
-uninstall:
- ${UNINSTALL} ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6} ${sbindir}
-
clean: generalclean

.PHONY: all ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6}
 
Old 12-22-2007, 12:37 PM
 
Default cluster ccs/ccs_test/Makefile ccs/ccs_tool/Mak ...

CVSROOT: /cvs/cluster
Module name: cluster
Changes by: fabbione@sourceware.org 2007-12-22 13:36:59

Modified files:
ccs/ccs_test : Makefile
ccs/ccs_tool : Makefile
ccs/daemon : Makefile
ccs/lib : Makefile
cman/cman_tool : Makefile
cman/daemon : Makefile
cman/init.d : Makefile
cman/lib : Makefile
cman/qdisk : Makefile
cman/tests : Makefile
dlm/lib : Makefile
dlm/tests/usertest: Makefile
dlm/tool : Makefile
fence/agents : Makefile
fence/agents/ipmilan: Makefile
fence/agents/manual: Makefile
fence/agents/rackswitch: Makefile
fence/agents/rps10: Makefile
fence/agents/scsi: Makefile
fence/agents/xvm: Makefile
fence/fence_node: Makefile
fence/fence_tool: Makefile
fence/fenced : Makefile
gfs : 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/tests/filecon2: Makefile
gfs/tests/mmdd : Makefile
gfs-kernel/src/gfs: Makefile
gfs2/convert : Makefile
gfs2/debug : Makefile
gfs2/edit : Makefile
gfs2/fsck : Makefile
gfs2/init.d : Makefile
gfs2/libgfs2 : Makefile
gfs2/mkfs : Makefile
gfs2/mount : Makefile
gfs2/quota : Makefile
gfs2/tool : Makefile
gnbd/client : 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/test : Makefile
group/tool : Makefile
make : fenceperl.mk fencepy.mk man.mk uninstall.mk
rgmanager/init.d: Makefile
rgmanager/src/clulib: Makefile
rgmanager/src/daemons: Makefile
rgmanager/src/resources: Makefile
rgmanager/src/utils: Makefile
Added files:
dlm/lib : 51-dlm.rules
Removed files:
dlm/scripts : 51-dlm.rules

Log message:
Fix a few regressions introduced by the big Makefile clean up:

- restore all: target as default. Libraries need a small special casing in the
include / target order due to var expansion.

- fix udev uninstall target: typo in make/uninstall.mk and requires (for sake
of simplicity 51-dlm.rules in /lib instead of /script.

- gfs/Makefile and fence/agents/Makefile don't need passthrough.mk.

- Fix uninstall of symlinks.

- Fix uninstall of rgmanager resources.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_test/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_tool/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/Makefile.diff?cvsroot=cluster&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/lib/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/Makefile.diff?cvsroot=cluster&r1=1.29&r2=1.30
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/Makefile.diff?cvsroot=cluster&r1=1.60&r2=1.61
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/init.d/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/lib/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/qdisk/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/tests/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/lib/51-dlm.rules.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/lib/Makefile.diff?cvsroot=cluster&r1=1.26&r2=1.27
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/scripts/51-dlm.rules.diff?cvsroot=cluster&r1=1.2&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tests/usertest/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tool/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ipmilan/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/manual/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rackswitch/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rps10/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/scsi/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xvm/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_node/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_tool/Makefile.diff?cvsroot=cluster&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_debug/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_edit/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_fsck/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_grow/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_jadd/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_mkfs/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_quota/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_tool/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/init.d/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/libgfs/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/tests/filecon2/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/tests/mmdd/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/Makefile.diff?cvsroot=cluster&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/convert/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/debug/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/edit/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/fsck/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/init.d/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/Makefile.diff?cvsroot=cluster&r1=1.25&r2=1.26
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mount/Makefile.diff?cvsroot=cluster&r1=1.22&r2=1.23
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/quota/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/client/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/server/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/fence_gnbd/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_export/Makefile.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_import/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/utils/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd-kernel/src/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/daemon/Makefile.diff?cvsroot=cluster&r1=1.26&r2=1.27
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/dlm_controld/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/Makefile.diff?cvsroot=cluster&r1=1.18&r2=1.19
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/lib/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/test/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/tool/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/fenceperl.mk.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/fencepy.mk.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/man.mk.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/make/uninstall.mk.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/init.d/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/clulib/Makefile.diff?cvsroot=cluster&r1=1.23&r2=1.24
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/Makefile.diff?cvsroot=cluster&r1=1.30&r2=1.31
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/Makefile.diff?cvsroot=cluster&r1=1.23&r2=1.24
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/Makefile.diff?cvsroot=cluster&r1=1.23&r2=1.24

--- cluster/ccs/ccs_test/Makefile 2007/12/22 12:46:24 1.13
+++ cluster/ccs/ccs_test/Makefile 2007/12/22 13:36:49 1.14
@@ -14,6 +14,8 @@

SBINDIRT=$(TARGET)

+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -28,7 +30,6 @@

LDFLAGS += -L${ccslibdir} -lccs

-all: depends ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/ccs/ccs_tool/Makefile 2007/12/22 12:46:24 1.19
+++ cluster/ccs/ccs_tool/Makefile 2007/12/22 13:36:49 1.20
@@ -14,6 +14,8 @@

SBINDIRT=$(TARGET)

+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -34,7 +36,6 @@
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
LDFLAGS += `xml2-config --libs` -L${libdir} -ldl

-all: depends ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/ccs/daemon/Makefile 2007/12/22 12:46:24 1.21
+++ cluster/ccs/daemon/Makefile 2007/12/22 13:36:49 1.22
@@ -14,6 +14,8 @@

SBINDIRT=$(TARGET)

+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -34,7 +36,6 @@
LDFLAGS += -L${cmanlibdir} -lcman -L${ccslibdir} -lccs
LDFLAGS += -L${libdir} `xml2-config --libs` -lpthread -ldl

-all: depends ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/ccs/lib/Makefile 2007/12/22 12:46:24 1.13
+++ cluster/ccs/lib/Makefile 2007/12/22 13:36:49 1.14
@@ -15,6 +15,8 @@
LIBDIRT=$(TARGET)
INCDIRT=ccs.h

+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -29,7 +31,6 @@
CFLAGS += -I$(S)/../include -I$(S)/../common
CFLAGS += -I${incdir}

-all: ${TARGET}

${TARGET}: ${OBJS}
${AR} cr $@ $^
--- cluster/cman/cman_tool/Makefile 2007/12/22 12:46:24 1.29
+++ cluster/cman/cman_tool/Makefile 2007/12/22 13:36:49 1.30
@@ -14,6 +14,8 @@

SBINDIRT=$(TARGET)

+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -29,7 +31,6 @@

LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman

-all: depends ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/cman/daemon/Makefile 2007/12/22 12:46:24 1.60
+++ cluster/cman/daemon/Makefile 2007/12/22 13:36:50 1.61
@@ -14,6 +14,8 @@

LCRSOT=$(TARGET)

+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -35,7 +37,6 @@
barrier.o
cmanccs.o

-all: depends ${TARGET}

${TARGET}: ${OBJS}
$(CC) -shared -Wl,-soname,$@ -o $@ $^ $(LDFLAGS)
--- cluster/cman/init.d/Makefile 2007/12/22 12:46:25 1.7
+++ cluster/cman/init.d/Makefile 2007/12/22 13:36:50 1.8
@@ -14,10 +14,11 @@

INITDT=$(TARGETS)

+all:
+
include ../../make/defines.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk

-all:

clean:
--- cluster/cman/lib/Makefile 2007/12/22 12:46:25 1.15
+++ cluster/cman/lib/Makefile 2007/12/22 13:36:50 1.16
@@ -22,20 +22,21 @@
INCDIRT=$(TARGET).h

include ../../make/defines.mk
+
+SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE _MINOR}
+STATICLIB=$(TARGET).a
+
+all: $(STATICLIB) $(SHAREDLIB)
+
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk

-SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_ MINOR}
-STATICLIB=$(TARGET).a
-
CFLAGS += -fPIC
CFLAGS += -I${cmanincdir} -I$(S)/../daemon
CFLAGS += -I${incdir}

-all: $(STATICLIB) $(SHAREDLIB)
-
$(TARGET).a: $(TARGET).o
${AR} r $@ $^
${RANLIB} $@
--- cluster/cman/qdisk/Makefile 2007/12/22 12:46:25 1.17
+++ cluster/cman/qdisk/Makefile 2007/12/22 13:36:50 1.18
@@ -15,6 +15,8 @@

SBINDIRT=${TARGET1} ${TARGET2}

+all: depends ${TARGET1} ${TARGET2}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -44,7 +46,6 @@
disk_util.o
proc.o

-all: depends ${TARGET1} ${TARGET2}

${TARGET1}: ${SHAREDOBJS} ${OBJS1}
$(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS)
--- cluster/cman/tests/Makefile 2007/12/21 20:13:44 1.12
+++ cluster/cman/tests/Makefile 2007/12/22 13:36:50 1.13
@@ -12,6 +12,8 @@

TARGETS= client libtest sysman sysmand

+all: depends ${TARGETS}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -21,7 +23,6 @@

LDFLAGS += -L${cmanlibdir} -lcman

-all: depends ${TARGETS}

depends:
$(MAKE) -C ../lib all
--- cluster/dlm/lib/51-dlm.rules 2007/03/28 13:49:45 1.2
+++ cluster/dlm/lib/51-dlm.rules 2007/12/22 13:36:50 1.3
@@ -1,3 +1,4 @@
-KERNEL=="dlm-control", NAME="misc/dlm-control"
-KERNEL=="dlm_default", NAME="misc/dlm_default" MODE="0666"
-KERNEL=="dlm_*", NAME="misc/%k" MODE="0660"
+KERNEL=="dlm-control", NAME="misc/dlm-control", MODE="0666"
+KERNEL=="dlm_default", NAME="misc/dlm_default", MODE="0666"
+KERNEL=="dlm_*", NAME="misc/%k", MODE="0660"
+
--- cluster/dlm/lib/Makefile 2007/12/22 12:46:25 1.26
+++ cluster/dlm/lib/Makefile 2007/12/22 13:36:50 1.27
@@ -25,9 +25,15 @@

INCDIRT=$(TARGET).h

-UDEVT=../scripts/51-dlm.rules
+UDEVT=51-dlm.rules

include ../../make/defines.mk
+
+SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE _MINOR} $(TARGET)_lt.so.${RELEASE_MAJOR}.${RELEASE_MINOR}
+STATICLIB=$(TARGET).a $(TARGET)_lt.a
+
+all: $(STATICLIB) $(SHAREDLIB)
+
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
include $(OBJDIR)/make/install.mk
@@ -35,16 +41,12 @@

AISTARGET= libaislock

-SHAREDLIB=$(TARGET).so.${RELEASE_MAJOR}.${RELEASE_ MINOR} $(TARGET)_lt.so.${RELEASE_MAJOR}.${RELEASE_MINOR}
-STATICLIB=$(TARGET).a $(TARGET)_lt.a
-
CFLAGS += -I$(S)
CFLAGS += -I${incdir}
CFLAGS += -I$(KERNEL_SRC)/include

LDFLAGS += -lpthread

-all: $(STATICLIB) $(SHAREDLIB)

$(TARGET).a: $(TARGET).o $(AISTARGET).o
${AR} r $@ $^
--- cluster/dlm/tests/usertest/Makefile 2007/12/21 20:13:45 1.16
+++ cluster/dlm/tests/usertest/Makefile 2007/12/22 13:36:51 1.17
@@ -13,11 +13,12 @@
TARGETS= dlmtest asttest lstest pingtest lvb
dlmtest2 flood alternate-lvb joinleave threads

+all: depends ${TARGETS}
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk

-all: depends ${TARGETS}

CFLAGS += -D_REENTRANT
CFLAGS += -I${dlmincdir}
--- cluster/dlm/tool/Makefile 2007/12/22 12:46:25 1.8
+++ cluster/dlm/tool/Makefile 2007/12/22 13:36:51 1.9
@@ -14,6 +14,8 @@

SBINDIRT=$(TARGET)

+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -28,7 +30,6 @@

LDFLAGS += -L${dlmlibdir} -ldlm

-all: ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/fence/agents/Makefile 2007/12/21 09:11:14 1.19
+++ cluster/fence/agents/Makefile 2007/12/22 13:36:51 1.20
@@ -12,7 +12,6 @@
################################################## #############################

include ../../make/defines.mk
-include $(OBJDIR)/make/passthrough.mk

SUBDIRS = ${fence_agents}

--- cluster/fence/agents/ipmilan/Makefile 2007/12/22 12:46:25 1.12
+++ cluster/fence/agents/ipmilan/Makefile 2007/12/22 13:36:51 1.13
@@ -15,6 +15,8 @@

SBINDIRT=$(TARGET)

+all: ${TARGET}
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -26,7 +28,6 @@

CFLAGS += -I${incdir}

-all: ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/fence/agents/manual/Makefile 2007/12/22 12:46:25 1.14
+++ cluster/fence/agents/manual/Makefile 2007/12/22 13:36:51 1.15
@@ -15,12 +15,13 @@

SBINDIRT=$(TARGET)

+all: ${TARGET}
+
include ../../../make/defines.mk
include $(OBJDIR)/make/clean.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk

-all: ${TARGET}

# Using manual override instead of the binary version.
# (this version does not require any configuration params
--- cluster/fence/agents/rackswitch/Makefile 2007/12/22 12:46:26 1.10
+++ cluster/fence/agents/rackswitch/Makefile 2007/12/22 13:36:51 1.11
@@ -15,6 +15,8 @@

SBINDIRT=$(TARGET)

+all: ${TARGET}
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -25,7 +27,6 @@

CFLAGS += -I${incdir}

-all: ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/fence/agents/rps10/Makefile 2007/12/22 12:46:26 1.10
+++ cluster/fence/agents/rps10/Makefile 2007/12/22 13:36:52 1.11
@@ -15,6 +15,8 @@

SBINDIRT=$(TARGET)

+all: ${TARGET}
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -27,7 +29,6 @@

CFLAGS += -I${incdir}

-all: ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/fence/agents/scsi/Makefile 2007/12/22 12:46:26 1.17
+++ cluster/fence/agents/scsi/Makefile 2007/12/22 13:36:52 1.18
@@ -15,12 +15,13 @@
SBINDIRT=$(TARGET) $(TARGET)_test
INITDT= scsi_reserve

+all: $(TARGET) $(TARGET)_test
+
include ../../../make/defines.mk
include $(OBJDIR)/make/clean.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk

-all: $(TARGET) $(TARGET)_test

$(TARGET):
: > $(TARGET)
--- cluster/fence/agents/xvm/Makefile 2007/12/22 12:46:26 1.19
+++ cluster/fence/agents/xvm/Makefile 2007/12/22 13:36:52 1.20
@@ -16,6 +16,8 @@

SBINDIRT=$(TARGET1) $(TARGET2)

+all: ${TARGET1} ${TARGET2}
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -55,7 +57,6 @@
EXTRA_LDFLAGS += -L${virtlibdir} -lvirt -L${openaislibdir} -lSaCkpt
XML_LDFLAGS += `xml2-config --libs`

-all: ${TARGET1} ${TARGET2}

${TARGET1}: ${SHAREDOBJS} ${OBJS1}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/fence/fence_node/Makefile 2007/12/22 12:46:26 1.14
+++ cluster/fence/fence_node/Makefile 2007/12/22 13:36:52 1.15
@@ -15,6 +15,8 @@

SBINDIRT=$(TARGET)

+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -32,7 +34,6 @@

LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman

-all: ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/fence/fence_tool/Makefile 2007/12/22 12:46:26 1.21
+++ cluster/fence/fence_tool/Makefile 2007/12/22 13:36:52 1.22
@@ -15,6 +15,8 @@

SBINDIRT=$(TARGET)

+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -32,7 +34,6 @@
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
LDFLAGS += -L../../group/lib -lgroup

-all: ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/fence/fenced/Makefile 2007/12/22 12:46:26 1.17
+++ cluster/fence/fenced/Makefile 2007/12/22 13:36:52 1.18
@@ -15,6 +15,8 @@

SBINDIRT=$(TARGET)

+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -35,7 +37,6 @@
LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
LDFLAGS += -L../../group/lib -l group

-all: ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs/Makefile 2007/12/21 09:11:14 1.14
+++ cluster/gfs/Makefile 2007/12/22 13:36:52 1.15
@@ -12,7 +12,6 @@
################################################## #############################

include ../make/defines.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/gfs/gfs_debug/Makefile 2007/12/22 12:46:26 1.14
+++ cluster/gfs/gfs_debug/Makefile 2007/12/22 13:36:52 1.15
@@ -15,6 +15,8 @@

SBINDIRT=$(TARGET)

+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -33,7 +35,6 @@
CFLAGS += -I$(S)/../include
CFLAGS += -I${incdir}

-all: ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs/gfs_edit/Makefile 2007/12/22 12:46:26 1.14
+++ cluster/gfs/gfs_edit/Makefile 2007/12/22 13:36:53 1.15
@@ -15,6 +15,8 @@

SBINDIRT=$(TARGET)

+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -31,7 +33,6 @@

LDFLAGS += -L${ncurseslibdir} -lncurses

-all: ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs/gfs_fsck/Makefile 2007/12/22 12:46:27 1.17
+++ cluster/gfs/gfs_fsck/Makefile 2007/12/22 13:36:53 1.18
@@ -16,6 +16,8 @@
SBINDIRT=$(TARGET1)
SBINSYMT=$(TARGET2)

+all: ${TARGET1} ${TARGET2}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -58,7 +60,6 @@
CFLAGS += -I$(S)/../include
CFLAGS += -I${incdir}

-all: ${TARGET1} ${TARGET2}

${TARGET1}: $(OBJS)
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs/gfs_grow/Makefile 2007/12/22 12:46:27 1.15
+++ cluster/gfs/gfs_grow/Makefile 2007/12/22 13:36:53 1.16
@@ -15,6 +15,8 @@

SBINDIRT=$(TARGET)

+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -31,7 +33,6 @@

LDFLAGS += -L../libgfs -lgfs

-all: depends ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs/gfs_jadd/Makefile 2007/12/22 12:46:27 1.15
+++ cluster/gfs/gfs_jadd/Makefile 2007/12/22 13:36:53 1.16
@@ -15,6 +15,8 @@

SBINDIRT=$(TARGET)

+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -31,7 +33,6 @@

LDFLAGS += -L../libgfs -lgfs

-all: depends ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs/gfs_mkfs/Makefile 2007/12/22 12:46:27 1.16
+++ cluster/gfs/gfs_mkfs/Makefile 2007/12/22 13:36:53 1.17
@@ -17,6 +17,8 @@
SBINDIRT=$(TARGET1)
SBINSYMT=$(TARGET2)

+all: depends ${TARGET1} ${TARGET2}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -38,7 +40,6 @@
LDFLAGS += -L${volidlibdir} -lvolume_id
LDFLAGS += -L../libgfs -lgfs

-all: depends ${TARGET1} ${TARGET2}

${TARGET1}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs/gfs_quota/Makefile 2007/12/22 12:46:27 1.15
+++ cluster/gfs/gfs_quota/Makefile 2007/12/22 13:36:53 1.16
@@ -15,6 +15,8 @@

SBINDIRT=$(TARGET)

+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -32,7 +34,6 @@
CFLAGS += -I$(S)/../include
CFLAGS += -I${incdir}

-all: ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs/gfs_tool/Makefile 2007/12/22 12:46:27 1.19
+++ cluster/gfs/gfs_tool/Makefile 2007/12/22 13:36:53 1.20
@@ -15,6 +15,8 @@

SBINDIRT=$(TARGET)

+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -36,7 +38,6 @@
CFLAGS += -I$(S)/../include
CFLAGS += -I${incdir}

-all: ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs/init.d/Makefile 2007/12/22 12:46:27 1.7
+++ cluster/gfs/init.d/Makefile 2007/12/22 13:36:54 1.8
@@ -14,10 +14,11 @@

INITDT=$(TARGET)

+all:
+
include ../../make/defines.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk

-all:

clean:
--- cluster/gfs/libgfs/Makefile 2007/12/22 12:46:27 1.15
+++ cluster/gfs/libgfs/Makefile 2007/12/22 13:36:54 1.16
@@ -13,6 +13,8 @@

TARGET=libgfs.a

+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -42,7 +44,6 @@
super.o
util.o

-all: ${TARGET}

${TARGET}: ${OBJS}
${AR} cru $@ $^
--- cluster/gfs/tests/filecon2/Makefile 2007/12/21 20:13:51 1.5
+++ cluster/gfs/tests/filecon2/Makefile 2007/12/22 13:36:54 1.6
@@ -11,6 +11,8 @@
################################################## #############################
################################################## #############################

+all: $(TARGETS)
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -21,7 +23,6 @@
CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
CFLAGS += -I../../include

-all: $(TARGETS)

%: %.o
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs/tests/mmdd/Makefile 2007/12/21 20:13:51 1.3
+++ cluster/gfs/tests/mmdd/Makefile 2007/12/22 13:36:54 1.4
@@ -11,6 +11,8 @@
################################################## #############################
################################################## #############################

+all: $(TARGETS)
+
include ../../../make/defines.mk
include $(OBJDIR)/make/clean.mk

@@ -18,7 +20,6 @@

CFLAGS += -D_GNU_SOURCE

-all: $(TARGETS)

mmdd.o: mmdd.c
$(CC) $(CFLAGS) -D_FILE_OFFSET_BITS=64 -c -o $@ $<
--- cluster/gfs-kernel/src/gfs/Makefile 2007/12/22 12:46:27 1.21
+++ cluster/gfs-kernel/src/gfs/Makefile 2007/12/22 13:36:54 1.22
@@ -17,6 +17,8 @@
KDIRT=fs/gfs
KHEADT=gfs_ondisk.h gfs_ioctl.h

+all: ${TARGET}
+
ifndef USING_KBUILD
include ../../../make/defines.mk
include $(OBJDIR)/make/clean.mk
@@ -68,7 +70,7 @@
unlinked.o
util.o

-all:
+${TARGET}:
${MAKE} -C ${KERNEL_BUILD} M=${PWD} symverfile=${SYMVERFILE} modules USING_KBUILD=yes

clean: generalclean
--- cluster/gfs2/convert/Makefile 2007/12/22 12:46:28 1.16
+++ cluster/gfs2/convert/Makefile 2007/12/22 13:36:54 1.17
@@ -14,6 +14,8 @@

SBINDIRT=$(TARGET)

+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -29,7 +31,6 @@

LDFLAGS += -L../libgfs2 -lgfs2

-all: depends ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs2/debug/Makefile 2007/08/28 04:35:43 1.5
+++ cluster/gfs2/debug/Makefile 2007/12/22 13:36:54 1.6
@@ -12,6 +12,8 @@
################################################## #############################

top_srcdir=..
+all: ${TARGET}
+
include ${top_srcdir}/make/defines.mk

TARGET= gfs2_debug
@@ -41,7 +43,6 @@

LDFLAGS+= -L${libdir}

-all: ${TARGET}

gfs2_debug: ${SOURCE}
${CC} ${CFLAGS} ${INCLUDE} ${LDFLAGS} ${SOURCE} ${LDLIBS} -o $@
--- cluster/gfs2/edit/Makefile 2007/12/22 12:46:28 1.16
+++ cluster/gfs2/edit/Makefile 2007/12/22 13:36:54 1.17
@@ -15,6 +15,8 @@

SBINDIRT=$(TARGET)

+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -34,7 +36,6 @@
LDFLAGS += -L${ncurseslibdir} -lncurses
LDFLAGS += -L../libgfs2/ -lgfs2

-all: depends ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs2/fsck/Makefile 2007/12/22 12:46:28 1.20
+++ cluster/gfs2/fsck/Makefile 2007/12/22 13:36:55 1.21
@@ -16,6 +16,8 @@
SBINDIRT=$(TARGET1)
SBINSYMT=$(TARGET2)

+all: depends ${TARGET1} ${TARGET2}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -49,7 +51,6 @@

LDFLAGS += -L../libgfs2 -lgfs2

-all: depends ${TARGET1} ${TARGET2}

${TARGET1}: $(OBJS)
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs2/init.d/Makefile 2007/12/22 12:46:28 1.7
+++ cluster/gfs2/init.d/Makefile 2007/12/22 13:36:55 1.8
@@ -14,10 +14,11 @@

INITDT=$(TARGET)

+all:
+
include ../../make/defines.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk

-all:

clean:
--- cluster/gfs2/libgfs2/Makefile 2007/12/22 12:46:28 1.17
+++ cluster/gfs2/libgfs2/Makefile 2007/12/22 13:36:55 1.18
@@ -13,6 +13,8 @@

TARGET= libgfs2.a

+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -41,7 +43,6 @@
super.o
rgrp.o

-all: ${TARGET}

${TARGET}: ${OBJS}
${AR} cru $@ $^
--- cluster/gfs2/mkfs/Makefile 2007/12/22 12:46:28 1.25
+++ cluster/gfs2/mkfs/Makefile 2007/12/22 13:36:55 1.26
@@ -11,6 +11,8 @@
SBINDIRT=$(TARGET1)
SBINSYMT=$(TARGET2) $(TARGET3) $(TARGET4)

+all: depends ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -30,7 +32,6 @@
LDFLAGS += -L${volidlibdir} -lvolume_id
LDFLAGS += -L../libgfs2 -lgfs2

-all: depends ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4}

${TARGET1}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs2/mount/Makefile 2007/12/21 20:13:52 1.22
+++ cluster/gfs2/mount/Makefile 2007/12/22 13:36:55 1.23
@@ -13,6 +13,8 @@
TARGET1= mount.gfs2
TARGET2= umount.gfs2

+all: ${TARGET1} ${TARGET2}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -31,7 +33,6 @@
CFLAGS += -I$(S)/../include
CFLAGS += -I${incdir}

-all: ${TARGET1} ${TARGET2}

${TARGET1}: ${SHAREDOBJS} ${OBJS1}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs2/quota/Makefile 2007/12/22 12:46:28 1.17
+++ cluster/gfs2/quota/Makefile 2007/12/22 13:36:56 1.18
@@ -15,6 +15,8 @@

SBINDIRT=$(TARGET)

+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -32,7 +34,6 @@

LDFLAGS += -L../libgfs2 -lgfs2

-all: depends ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gfs2/tool/Makefile 2007/12/22 12:46:28 1.19
+++ cluster/gfs2/tool/Makefile 2007/12/22 13:36:56 1.20
@@ -15,6 +15,8 @@

SBINDIRT=$(TARGET)

+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -37,7 +39,6 @@

LDFLAGS += -L../libgfs2 -lgfs2

-all: depends ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gnbd/client/Makefile 2007/12/22 12:46:28 1.19
+++ cluster/gnbd/client/Makefile 2007/12/22 13:36:56 1.20
@@ -16,6 +16,8 @@

SBINDIRT=$(TARGET1) $(TARGET2)

+all: ${TARGET1} ${TARGET2}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -37,7 +39,6 @@

LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread

-all: ${TARGET1} ${TARGET2}

${TARGET1}: ${SHAREDOBJS} ${OBJS1}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gnbd/server/Makefile 2007/12/22 12:46:29 1.19
+++ cluster/gnbd/server/Makefile 2007/12/22 13:36:56 1.20
@@ -16,6 +16,8 @@

SBINDIRT=$(TARGET1) $(TARGET2)

+all: ${TARGET1} ${TARGET2}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -42,7 +44,6 @@

LDFLAGS+= -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread

-all: ${TARGET1} ${TARGET2}

${TARGET1}: ${SHAREDOBJS} ${OBJS1}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gnbd/tools/fence_gnbd/Makefile 2007/12/22 12:46:29 1.10
+++ cluster/gnbd/tools/fence_gnbd/Makefile 2007/12/22 13:36:56 1.11
@@ -15,6 +15,8 @@

SBINDIRT=$(TARGET)

+all: ${TARGET}
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -26,7 +28,6 @@
CFLAGS += -I$(S)/../../include -I$(S)/../gnbd_import
CFLAGS += -I${incdir}

-all: ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gnbd/tools/gnbd_export/Makefile 2007/12/22 12:46:29 1.20
+++ cluster/gnbd/tools/gnbd_export/Makefile 2007/12/22 13:36:56 1.21
@@ -15,6 +15,8 @@

SBINDIRT=$(TARGET) gnbd_get_uid

+all: ${TARGET} gnbd_get_uid
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -32,7 +34,6 @@

LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread

-all: ${TARGET} gnbd_get_uid

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gnbd/tools/gnbd_import/Makefile 2007/12/22 12:46:29 1.17
+++ cluster/gnbd/tools/gnbd_import/Makefile 2007/12/22 13:36:57 1.18
@@ -15,6 +15,8 @@

SBINDIRT=$(TARGET)

+all: ${TARGET}
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -33,7 +35,6 @@

LDFLAGS += -L${libdir} -L${cmanlibdir} -lcman -ldl -lpthread

-all: ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/gnbd/utils/Makefile 2007/12/22 12:46:29 1.5
+++ cluster/gnbd/utils/Makefile 2007/12/22 13:36:57 1.6
@@ -11,6 +11,8 @@
################################################## #############################
################################################## #############################

+all: ${SHAREDOBJS}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -24,6 +26,5 @@
CFLAGS += -I${cmanincdir}
CFLAGS += -I$(S)/../include

-all: ${SHAREDOBJS}

clean: generalclean
--- cluster/gnbd-kernel/src/Makefile 2007/12/22 12:46:29 1.11
+++ cluster/gnbd-kernel/src/Makefile 2007/12/22 13:36:57 1.12
@@ -17,6 +17,8 @@
KDIRT=drivers/block/gnbd
KHEADT=gnbd.h

+all: ${TARGET}
+
ifndef USING_KBUILD
include ../../make/defines.mk
include $(OBJDIR)/make/clean.mk
@@ -30,7 +32,7 @@

obj-m := gnbd.o

-all:
+${TARGET}:
${MAKE} -C ${KERNEL_BUILD} M=${PWD} symverfile=${SYMVERFILE} modules USING_KBUILD=yes

clean: generalclean
--- cluster/group/daemon/Makefile 2007/12/22 12:46:29 1.26
+++ cluster/group/daemon/Makefile 2007/12/22 13:36:57 1.27
@@ -14,6 +14,8 @@

SBINDIRT=$(TARGET)

+all: ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -32,7 +34,6 @@

LDFLAGS += -L${cmanlibdir} -L${openaislibdir} -L${libdir} -lcman -lcpg

-all: ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/group/dlm_controld/Makefile 2007/12/22 12:46:29 1.16
+++ cluster/group/dlm_controld/Makefile 2007/12/22 13:36:57 1.17
@@ -14,6 +14,8 @@

SBINDIRT=$(TARGET)

+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -35,7 +37,6 @@
LDFLAGS += -L${openaislibdir} -lcpg -lSaCkpt
LDFLAGS += -L../lib -lgroup

-all: depends ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/group/gfs_controld/Makefile 2007/12/22 12:46:29 1.18
+++ cluster/group/gfs_controld/Makefile 2007/12/22 13:36:57 1.19
@@ -14,6 +14,8 @@

SBINDIRT=$(TARGET)

+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -37,7 +39,6 @@
LDFLAGS += -L${libdir}
LDFLAGS += -L../lib -lgroup

-all: depends ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/group/lib/Makefile 2007/12/22 12:46:29 1.12
+++ cluster/group/lib/Makefile 2007/12/22 13:36:58 1.13
@@ -12,19 +12,18 @@

TARGET=libgroup

+all: $(TARGET).a
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk

-STATICLIB=$(TARGET).a
-
CFLAGS += -fPIC
CFLAGS += -I$(S) -I$(S)/../daemon
CFLAGS += -I${incdir}

-all: $(STATICLIB)

$(TARGET).a: $(TARGET).o
${AR} r $@ $^
--- cluster/group/test/Makefile 2007/12/21 20:13:54 1.6
+++ cluster/group/test/Makefile 2007/12/22 13:36:58 1.7
@@ -12,11 +12,12 @@

TARGETS= client clientd

+all: $(TARGETS)
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk

-all: $(TARGETS)

%: %.o
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/group/tool/Makefile 2007/12/22 12:46:30 1.15
+++ cluster/group/tool/Makefile 2007/12/22 13:36:58 1.16
@@ -14,6 +14,8 @@

SBINDIRT=$(TARGET)

+all: depends ${TARGET}
+
include ../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -27,7 +29,6 @@

LDFLAGS += -L../lib -lgroup

-all: depends ${TARGET}

${TARGET}: ${OBJS}
$(CC) -o $@ $^ $(LDFLAGS)
--- cluster/make/fenceperl.mk 2007/12/22 12:46:30 1.4
+++ cluster/make/fenceperl.mk 2007/12/22 13:36:58 1.5
@@ -1,11 +1,11 @@
SBINDIRT=$(TARGET)

+all: $(TARGET)
+
include $(OBJDIR)/make/clean.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk

-all: $(TARGET)
-
$(TARGET):
: > $(TARGET)
awk "{print}($$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(S)/$(TARGET).pl >> $(TARGET)
--- cluster/make/fencepy.mk 2007/12/22 12:46:30 1.4
+++ cluster/make/fencepy.mk 2007/12/22 13:36:58 1.5
@@ -1,11 +1,11 @@
SBINDIRT=$(TARGET)

+all: $(TARGET)
+
include $(OBJDIR)/make/clean.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk

-all: $(TARGET)
-
$(TARGET):
: > $(TARGET)
awk "{print}($$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(S)/$(TARGET).py >> $(TARGET)
--- cluster/make/man.mk 2007/12/21 18:37:16 1.1
+++ cluster/make/man.mk 2007/12/22 13:36:58 1.2
@@ -1,3 +1,5 @@
+all:
+
install:
for i in ${TARGET}; do
p=`echo $$i | sed -e 's#.*.##g'`;
@@ -11,6 +13,4 @@
${UNINSTALL} $$i ${mandir}/man$$p;
done

-all:
-
clean:
--- cluster/make/uninstall.mk 2007/12/22 12:46:30 1.1
+++ cluster/make/uninstall.mk 2007/12/22 13:36:58 1.2
@@ -12,7 +12,7 @@
${UNINSTALL} ${SBINDIRT} ${sbindir}
endif
ifdef SBINSYMT
- ${UNINSTALL} ${SBINDIRT} ${sbindir}
+ ${UNINSTALL} ${SBINSYMT} ${sbindir}
endif
ifdef LCRSOT
${UNINSTALL} ${LCRSOT} ${libexecdir}/lcrso
@@ -21,7 +21,7 @@
${UNINSTALL} ${INITDT} ${DESTDIR}/etc/init.d
endif
ifdef UDEVT
- ${UNINSTALL} ${UDEVT} {DESTDIR}/etc/udev/rules.d
+ ${UNINSTALL} ${UDEVT} ${DESTDIR}/etc/udev/rules.d
endif
ifdef KMODT
${UNINSTALL} ${KMODT} ${module_dir}/${KDIRT}
--- cluster/rgmanager/init.d/Makefile 2007/12/22 12:46:30 1.6
+++ cluster/rgmanager/init.d/Makefile 2007/12/22 13:36:58 1.7
@@ -14,11 +14,12 @@

INITDT=$(TARGET)

+all:
+
include ../../make/defines.mk
include $(OBJDIR)/make/install.mk
include $(OBJDIR)/make/uninstall.mk

-all:

clean:

--- cluster/rgmanager/src/clulib/Makefile 2007/12/22 12:46:30 1.23
+++ cluster/rgmanager/src/clulib/Makefile 2007/12/22 13:36:58 1.24
@@ -14,6 +14,8 @@
TARGET2= liblalloc.a
TARGET3= msgtest

+all: ${TARGET1} ${TARGET2} ${TARGET3}
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -38,7 +40,6 @@
LDFLAGS += -L. -lclulib -llalloc
LDFLAGS += -lpthread

-all: ${TARGET1} ${TARGET2} ${TARGET3}

${TARGET1}: ${OBJS1}
${AR} cru $@ $^
--- cluster/rgmanager/src/daemons/Makefile 2007/12/22 12:46:30 1.30
+++ cluster/rgmanager/src/daemons/Makefile 2007/12/22 13:36:59 1.31
@@ -17,6 +17,8 @@

SBINDIRT=$(TARGET1) $(TARGET2) $(TARGET3)

+all: depends ${TARGET1} ${TARGET2} ${TARGET3}
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -79,7 +81,6 @@
LOCAL_LDFLAGS += -llalloc
READLINE_LDFLAGS += -L${readlinelibdir} -lreadline

-all: depends ${TARGET1} ${TARGET2} ${TARGET3}

${TARGET1}: ${OBJS1}
$(CC) -o $@ $^ $(LDFLAGS) $(CCS_LDFLAGS) $(CMAN_LDFLAGS)
--- cluster/rgmanager/src/resources/Makefile 2007/12/22 12:46:30 1.23
+++ cluster/rgmanager/src/resources/Makefile 2007/12/22 13:36:59 1.24
@@ -10,6 +10,8 @@
################################################## #############################
################################################## #############################

+all:
+
include ../../../make/defines.mk

RESOURCES=fs.sh service.sh ip.sh nfsclient.sh nfsexport.sh
@@ -29,7 +31,6 @@
utils/httpd-parse-config.pl utils/tomcat-parse-config.pl
utils/member_util.sh

-all:

install: all
install -d ${sharedir}/utils
@@ -44,7 +45,7 @@
done

uninstall:
- ${UNINSTALL} ${TARGETS} ${METADATA} ${UTIL_TARGETS} ${sharedir}
+ ${UNINSTALL} ${RESOURCES} ${TARGETS} ${METADATA} ${UTIL_TARGETS} ${sharedir}

clean:

--- cluster/rgmanager/src/utils/Makefile 2007/12/22 12:46:30 1.23
+++ cluster/rgmanager/src/utils/Makefile 2007/12/22 13:36:59 1.24
@@ -19,6 +19,8 @@

SBINDIRT=$(TARGET1) $(TARGET2) $(TARGET3) $(TARGET4) $(TARGET5) $(TARGET6)

+all: depends ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6}
+
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
include $(OBJDIR)/make/clean.mk
@@ -36,7 +38,6 @@
LDFLAGS += -lcman -lpthread -ldl -lncurses -lccs
LDFLAGS += -L../clulib -lclulib

-all: depends ${TARGET1} ${TARGET2} ${TARGET3} ${TARGET4} ${TARGET5} ${TARGET6}

${TARGET1}: ${TARGET1:=.o}
$(CC) -o $@ $^ $(LDFLAGS)
 

Thread Tools




All times are GMT. The time now is 12:32 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org