* [Cluster-devel] cluster ./Makefile ccs/Makefile ccs/ccs_test/M ...
@ 2006-08-11 15:18 rpeterso
0 siblings, 0 replies; only message in thread
From: rpeterso @ 2006-08-11 15:18 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: rpeterso at sourceware.org 2006-08-11 15:18:16
Modified files:
. : Makefile
ccs : Makefile
ccs/ccs_test : Makefile
ccs/daemon : Makefile
ccs/init.d : Makefile
ccs/lib : Makefile
clumon : Makefile
clumon/src : Makefile
clumon/src/cim-provider: Makefile
clumon/src/daemon: Makefile
clumon/src/snmp-agent: Makefile
cman : Makefile configure
cman/cman_tool : Makefile
cman/daemon : Makefile
cman/init.d : Makefile
cman/lib : Makefile
cman/qdisk : Makefile
cman/tests : Makefile
cmirror : Makefile
csnap : Makefile
csnap/src : Makefile
csnap-kernel : Makefile
csnap-kernel/src: Makefile
ddraid : Makefile
dlm : Makefile
dlm/lib : Makefile
dlm/tests/usertest: Makefile
doc : usage.txt
fence : Makefile
fence/agents : 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/xen: Makefile
fence/agents/zvm: Makefile
fence/fence_node: Makefile
fence/fence_tool: Makefile
fence/fenced : Makefile
fence/init.d : Makefile
gfs : Makefile configure
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/make : gfs.spec.in
gfs-kernel : Makefile
gfs-kernel/src : Makefile
gfs-kernel/src/dlm: Makefile
gfs-kernel/src/harness: Makefile
gfs-kernel/src/nolock: Makefile
gfs2 : Makefile configure
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 : Makefile
gnbd/client : Makefile gnbd_monitor.c gnbd_recvd.c
gnbd/man : Makefile
gnbd/server : Makefile device.c gserv.c
gnbd/tools : Makefile
gnbd/tools/fence_gnbd: Makefile
gnbd/tools/gnbd_export: Makefile
gnbd/tools/gnbd_import: Makefile gnbd_import.c
gnbd-kernel : Makefile
gnbd-kernel/src: Makefile gnbd.c
group : Makefile configure
group/daemon : Makefile
group/dlm_controld: Makefile
group/gfs_controld: Makefile
group/lib : Makefile
group/make : defines.mk.input
group/tool : Makefile
rgmanager : Makefile
rgmanager/src : Makefile
Removed files:
ccs/bin : Makefile
cman/bin : Makefile
csnap/bin : Makefile
fence/bin : Makefile
gfs/bin : Makefile
gfs2/bin : Makefile
gnbd/bin : Makefile
Log message:
This change is for Makefile reform allowing a simple
"make" command to recompile the entire cluster suite:
1. All Makefiles have been changed to get rid of references
to "copytobin" and the bin directory. This will
eliminate discrepancies between "bin" versions and
installed versions of the programs.
2. The cman and group configure files have been modified
to allow linking properly to /usr/lib64 on x86_64
systems without specifying libdir.
3. Fixed several problems relating to "make install"
not recompiling modified code.
4. Fixed some dependency problems with gfs and gfs2 tools
that linked against libgfs and libgfs2 respectively.
5. All Makefiles have been updated to use "make -C <dir>"
rather than "cd <dir> ; make" so that compile errors
won't charge ahead without stopping you.
6. Deleted references to obsolete iddev library.
7. Got rid of more "linux" symlinks for includes.
8. Misc minor Makefile cleanup.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/Makefile.diff?cvsroot=cluster&r1=1.22&r2=1.23
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/bin/Makefile.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/ccs_test/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/init.d/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/lib/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/clumon/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/clumon/src/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/clumon/src/cim-provider/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/clumon/src/daemon/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/clumon/src/snmp-agent/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/configure.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/bin/Makefile.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/Makefile.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/Makefile.diff?cvsroot=cluster&r1=1.46&r2=1.47
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/init.d/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/lib/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.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/tests/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cmirror/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/csnap/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/csnap/bin/Makefile.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/csnap/src/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/csnap-kernel/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/csnap-kernel/src/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ddraid/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/lib/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tests/usertest/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/doc/usage.txt.diff?cvsroot=cluster&r1=1.32&r2=1.33
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/Makefile.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/apc/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/baytech/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/bladecenter/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/brocade/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/bullpap/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/cpint/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/drac/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/egenera/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ibmblade/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ilo/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/ipmilan/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/manual/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/mcdata/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rackswitch/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rps10/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rsa/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/rsb/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/sanbox2/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/scsi/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/vixel/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/vmware/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/wti/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xcat/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/xen/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/zvm/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/bin/Makefile.diff?cvsroot=cluster&r1=1.10&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_node/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fence_tool/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/fenced/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/init.d/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/configure.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/bin/Makefile.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_debug/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_edit/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_fsck/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_grow/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_jadd/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_mkfs/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_quota/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/gfs_tool/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/init.d/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/libgfs/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs/make/gfs.spec.in.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/harness/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/nolock/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/configure.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/bin/Makefile.diff?cvsroot=cluster&r1=1.8&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/convert/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/debug/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/edit/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/fsck/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/init.d/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mkfs/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/mount/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/quota/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/bin/Makefile.diff?cvsroot=cluster&r1=1.3&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/client/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/client/gnbd_monitor.c.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/client/gnbd_recvd.c.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/man/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/server/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/server/device.c.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/server/gserv.c.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/fence_gnbd/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_export/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_import/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd/tools/gnbd_import/gnbd_import.c.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd-kernel/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd-kernel/src/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gnbd-kernel/src/gnbd.c.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/configure.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/daemon/Makefile.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/dlm_controld/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/Makefile.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/lib/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/make/defines.mk.input.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/tool/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
--- cluster/Makefile 2006/07/19 14:45:58 1.22
+++ cluster/Makefile 2006/08/11 15:18:03 1.23
@@ -16,89 +16,77 @@
all:
- cd gnbd-kernel && ${MAKE}
- cd cman/lib && ${MAKE}
- cd ccs && ${MAKE}
- cd cman && ${MAKE}
- cd group && ${MAKE}
- cd dlm && ${MAKE}
- cd fence && ${MAKE}
- cd gfs-kernel && ${MAKE}
- cd gfs && ${MAKE}
- cd gfs2 && ${MAKE}
- cd gnbd && ${MAKE}
- cd rgmanager && ${MAKE}
-# cd cmirror && ${MAKE}
-
-copytobin:
- cd gfs-kernel && ${MAKE} copytobin
- cd gnbd-kernel && ${MAKE} copytobin
- cd ccs && ${MAKE} copytobin
- cd cman && ${MAKE} copytobin
- cd dlm && ${MAKE} copytobin
- cd fence && ${MAKE} copytobin
- cd gfs && ${MAKE} copytobin
- cd gfs2 && ${MAKE} copytobin
- cd gnbd && ${MAKE} copytobin
- cd rgmanager && ${MAKE} copytobin
-# cd cmirror && ${MAKE} copytobin
+ ${MAKE} -C gnbd-kernel all
+ ${MAKE} -C cman/lib all
+ ${MAKE} -C ccs all
+ ${MAKE} -C cman all
+ ${MAKE} -C group all
+ ${MAKE} -C dlm all
+ ${MAKE} -C fence all
+ ${MAKE} -C gfs-kernel all
+ ${MAKE} -C gfs all
+ ${MAKE} -C gfs2 all
+ ${MAKE} -C gnbd all
+ ${MAKE} -C rgmanager all
+# ${MAKE} -C cmirror all
clean:
rm -f *tar.gz
rm -rf build
- cd gfs-kernel && ${MAKE} clean
- cd gnbd-kernel && ${MAKE} clean
- cd ccs && ${MAKE} clean
- cd cman && ${MAKE} clean
- cd group && ${MAKE} clean
- cd dlm && ${MAKE} clean
- cd fence && ${MAKE} clean
- cd gfs && ${MAKE} clean
- cd gfs2 && ${MAKE} clean
- cd gnbd && ${MAKE} clean
- cd rgmanager && ${MAKE} clean
-# cd cmirror && ${MAKE} clean
+ ${MAKE} -C gfs-kernel clean
+ ${MAKE} -C gnbd-kernel clean
+ ${MAKE} -C ccs clean
+ ${MAKE} -C cman clean
+ ${MAKE} -C group clean
+ ${MAKE} -C dlm clean
+ ${MAKE} -C fence clean
+ ${MAKE} -C gfs clean
+ ${MAKE} -C gfs2 clean
+ ${MAKE} -C gnbd clean
+ ${MAKE} -C rgmanager clean
+# ${MAKE} -C cmirror clean
distclean:
- cd gfs-kernel && ${MAKE} distclean
- cd gnbd-kernel && ${MAKE} distclean
- cd ccs && ${MAKE} distclean
- cd cman && ${MAKE} distclean
- cd group && ${MAKE} distclean
- cd dlm && ${MAKE} distclean
- cd fence && ${MAKE} distclean
- cd gfs && ${MAKE} distclean
- cd gfs2 && ${MAKE} distclean
- cd gnbd && ${MAKE} distclean
- cd rgmanager && ${MAKE} distclean
-# cd cmirror && ${MAKE} distclean
-
-install:
- cd gfs-kernel && ${MAKE} install
- cd gnbd-kernel && ${MAKE} install
- cd ccs && ${MAKE} install
- cd cman && ${MAKE} install
- cd group && ${MAKE} install
- cd dlm && ${MAKE} install
- cd fence && ${MAKE} install
- cd gfs && ${MAKE} install
- cd gfs2 && ${MAKE} install
- cd gnbd && ${MAKE} install
- cd rgmanager && ${MAKE} install
-# cd cmirror && ${MAKE} install
+ ${MAKE} -C gfs-kernel distclean
+ ${MAKE} -C gnbd-kernel distclean
+ ${MAKE} -C ccs distclean
+ ${MAKE} -C cman distclean
+ ${MAKE} -C group distclean
+ ${MAKE} -C dlm distclean
+ ${MAKE} -C fence distclean
+ ${MAKE} -C gfs distclean
+ ${MAKE} -C gfs2 distclean
+ ${MAKE} -C gnbd distclean
+ ${MAKE} -C rgmanager distclean
+# ${MAKE} -C cmirror distclean
+
+install: all
+ ${MAKE} -C gfs-kernel install
+ ${MAKE} -C gnbd-kernel install
+ ${MAKE} -C ccs install
+ ${MAKE} -C cman install
+ ${MAKE} -C group install
+ ${MAKE} -C dlm install
+ ${MAKE} -C fence install
+ ${MAKE} -C gfs install
+ ${MAKE} -C gfs2 install
+ ${MAKE} -C gnbd install
+ ${MAKE} -C rgmanager install
+# ${MAKE} -C cmirror install
uninstall:
- cd gfs-kernel && ${MAKE} uninstall
- cd gnbd-kernel && ${MAKE} uninstall
- cd ccs && ${MAKE} uninstall
- cd cman && ${MAKE} uninstall
- cd dlm && ${MAKE} uninstall
- cd fence && ${MAKE} uninstall
- cd gfs && ${MAKE} uninstall
- cd gfs2 && ${MAKE} uninstall
- cd gnbd && ${MAKE} uninstall
- cd rgmanager && ${MAKE} uninstall
-# cd cmirror && ${MAKE} uninstall
+ ${MAKE} -C gfs-kernel uninstall
+ ${MAKE} -C gnbd-kernel uninstall
+ ${MAKE} -C ccs uninstall
+ ${MAKE} -C cman uninstall
+ ${MAKE} -C group uninstall
+ ${MAKE} -C dlm uninstall
+ ${MAKE} -C fence uninstall
+ ${MAKE} -C gfs uninstall
+ ${MAKE} -C gfs2 uninstall
+ ${MAKE} -C gnbd uninstall
+ ${MAKE} -C rgmanager uninstall
+# ${MAKE} -C cmirror uninstall
latest_tags:
${LATEST_TAG} gfs-kernel
--- cluster/ccs/Makefile 2006/06/29 18:58:31 1.9
+++ cluster/ccs/Makefile 2006/08/11 15:18:03 1.10
@@ -11,38 +11,31 @@
###############################################################################
all:
- cd daemon && ${MAKE} all
- cd lib && ${MAKE} all
- cd ccs_test && ${MAKE} all
- cd ccs_tool && ${MAKE} all
-
-copytobin:
- cd daemon && ${MAKE} copytobin
- cd lib && ${MAKE} copytobin
- cd ccs_test && ${MAKE} copytobin
- cd ccs_tool && ${MAKE} copytobin
+ ${MAKE} -C daemon all
+ ${MAKE} -C lib all
+ ${MAKE} -C ccs_test all
+ ${MAKE} -C ccs_tool all
clean:
- cd bin && ${MAKE} clean
- cd daemon && ${MAKE} clean
- cd lib && ${MAKE} clean
- cd ccs_test && ${MAKE} clean
- cd ccs_tool && ${MAKE} clean
+ ${MAKE} -C daemon clean
+ ${MAKE} -C lib clean
+ ${MAKE} -C ccs_test clean
+ ${MAKE} -C ccs_tool clean
rm -f *~
distclean: clean
rm -f make/defines.mk
-install:
- cd daemon && ${MAKE} install
- cd lib && ${MAKE} install
- cd ccs_test && ${MAKE} install
- cd ccs_tool && ${MAKE} install
- cd man && ${MAKE} install
+install: all
+ ${MAKE} -C daemon install
+ ${MAKE} -C lib install
+ ${MAKE} -C ccs_test install
+ ${MAKE} -C ccs_tool install
+ ${MAKE} -C man install
uninstall:
- cd daemon && ${MAKE} uninstall
- cd lib && ${MAKE} uninstall
- cd ccs_test && ${MAKE} uninstall
- cd ccs_tool && ${MAKE} uninstall
- cd man && ${MAKE} uninstall
+ ${MAKE} -C daemon uninstall
+ ${MAKE} -C lib uninstall
+ ${MAKE} -Cccs_test uninstall
+ ${MAKE} -C ccs_tool uninstall
+ ${MAKE} -Cman uninstall
--- cluster/ccs/ccs_test/Makefile 2005/02/11 17:38:08 1.2
+++ cluster/ccs/ccs_test/Makefile 2006/08/11 15:18:03 1.3
@@ -30,16 +30,13 @@
all: ccs_test
-copytobin: all
- cp ccs_test ${top_srcdir}/bin
-
ccs_test: ccs_test.c ${ccs_libdir}/libccs.a
${CC} ${CFLAGS} ${INCLUDE} ccs_test.c ${LDFLAGS} ${LOADLIBES} ${LDLIBS}-o $@
${ccs_libdir}/libccs.a:
- cd ${ccs_libdir} && ${MAKE} libccs.a
+ ${MAKE} -C ${ccs_libdir} libccs.a
-install: ccs_test
+install: all
install -d ${sbindir}
install ccs_test ${sbindir}
--- cluster/ccs/daemon/Makefile 2006/04/20 18:46:54 1.8
+++ cluster/ccs/daemon/Makefile 2006/08/11 15:18:03 1.9
@@ -15,6 +15,7 @@
include ${top_srcdir}/make/defines.mk
+TARGET= ccsd
INCLUDE= -I. -I../include -I../common -I${top_srcdir}/config -I../../cman/lib
ifeq ($(DEBUG),y)
@@ -27,21 +28,18 @@
LDFLAGS+= -L${libdir} `xml2-config --libs` -lpthread -ldl
-all: ccsd
-
-copytobin: all
- cp ccsd ${top_srcdir}/bin
+all: ${TARGET}
ccsd: ccsd.c cnx_mgr.c cluster_mgr.c misc.c ../common/log.c globals.c
${CC} ${CFLAGS} ${INCLUDE} -o $@ $^ ${LDFLAGS} \
../../cman/lib/libcman.a
-install: ccsd
+install: all
install -d ${sbindir}
- install ccsd ${sbindir}
+ install ${TARGET} ${sbindir}
uninstall:
- ${UNINSTALL} ccsd ${sbindir}
+ ${UNINSTALL} ${TARGET} ${sbindir}
clean:
- rm -rf *.o ccsd *~
+ rm -rf *.o ${TARGET} *~
--- cluster/ccs/init.d/Makefile 2004/12/17 20:05:32 1.1
+++ cluster/ccs/init.d/Makefile 2006/08/11 15:18:03 1.2
@@ -18,8 +18,7 @@
include ${top_srcdir}/make/defines.mk
-copytobin:
-
+all:
clean:
install:
--- cluster/ccs/lib/Makefile 2006/06/06 09:42:43 1.3
+++ cluster/ccs/lib/Makefile 2006/08/11 15:18:03 1.4
@@ -21,21 +21,19 @@
else
CFLAGS+= -O2 -fPIC -D_FILE_OFFSET_BITS=64
endif
-
+
all: libccs.a
-copytobin: all
-
libccs.a: libccs.o log.o
${AR} cr libccs.a libccs.o log.o
-
-libccs.o: libccs.c
+
+libccs.o: libccs.c ccs.h
${CC} -c ${CFLAGS} ${INCLUDE} $^
log.o: ../common/log.c
${CC} -c ${CFLAGS} ${INCLUDE} $^
-install: libccs.a ccs.h
+install: all
install -d ${libdir}
install -m644 libccs.a ${libdir}
install -d ${incdir}
@@ -48,4 +46,3 @@
clean:
rm -rf *~ *.o libccs.a
-
--- cluster/clumon/Makefile 2005/12/07 16:16:36 1.3
+++ cluster/clumon/Makefile 2006/08/11 15:18:04 1.4
@@ -16,30 +16,30 @@
include ${top_srcdir}/make/defines.mk
all:
- cd src && ${MAKE} all
+ ${MAKE} -C src all
clean:
- cd src && ${MAKE} clean
+ ${MAKE} -C src clean
distclean: clean
rm -f make/defines.mk
-install:
- cd src && ${MAKE} install
- cd man && ${MAKE} install
- cd init.d && ${MAKE} install
+install: all
+ ${MAKE} -C src install
+ ${MAKE} -C man install
+ ${MAKE} -C init.d install
install -d ${DESTDIR}/usr/share/snmp/mibs
install REDHAT-MIB ${DESTDIR}/usr/share/snmp/mibs/
install REDHAT-CLUSTER-MIB ${DESTDIR}/usr/share/snmp/mibs/
uninstall:
- cd src && ${MAKE} uninstall
- cd man && ${MAKE} uninstall
- cd init.d && ${MAKE} uninstall
+ ${MAKE} -C src uninstall
+ ${MAKE} -C man uninstall
+ ${MAKE} -C init.d uninstall
${UNINSTALL} REDHAT-MIB ${DESTDIR}/usr/share/snmp/mibs/
${UNINSTALL} REDHAT-CLUSTER-MIB ${DESTDIR}/usr/share/snmp/mibs/
check:
- cd src && ${MAKE} check
+ ${MAKE} -C src check
rebuild: clean all
--- cluster/clumon/src/Makefile 2005/11/23 23:30:36 1.3
+++ cluster/clumon/src/Makefile 2006/08/11 15:18:04 1.4
@@ -12,35 +12,35 @@
all:
- cd common && ${MAKE} all
- cd daemon && ${MAKE} all
- cd snmp-agent && ${MAKE} all
- cd cim-provider && ${MAKE} all
+ ${MAKE} -C common all
+ ${MAKE} -C daemon all
+ ${MAKE} -C snmp-agent all
+ ${MAKE} -C cim-provider all
clean:
- cd common && ${MAKE} clean
- cd daemon && ${MAKE} clean
- cd snmp-agent && ${MAKE} clean
- cd cim-provider && ${MAKE} clean
+ ${MAKE} -C common clean
+ ${MAKE} -C daemon clean
+ ${MAKE} -C snmp-agent clean
+ ${MAKE} -C cim-provider clean
check:
- cd common && ${MAKE} check
- cd daemon && ${MAKE} check
- cd snmp-agent && ${MAKE} check
- cd cim-provider && ${MAKE} check
+ ${MAKE} -C common check
+ ${MAKE} -C daemon check
+ ${MAKE} -C snmp-agent check
+ ${MAKE} -C cim-provider check
distclean: clean
-install:
- cd common && ${MAKE} install
- cd daemon && ${MAKE} install
- cd snmp-agent && ${MAKE} install
- cd cim-provider && ${MAKE} install
+install: all
+ ${MAKE} -C common install
+ ${MAKE} -C daemon install
+ ${MAKE} -C snmp-agent install
+ ${MAKE} -C cim-provider install
uninstall:
- cd common && ${MAKE} uninstall
- cd daemon && ${MAKE} uninstall
- cd snmp-agent && ${MAKE} uninstall
- cd cim-provider && ${MAKE} uninstall
+ ${MAKE} -C common uninstall
+ ${MAKE} -C daemon uninstall
+ ${MAKE} -C snmp-agent uninstall
+ ${MAKE} -C cim-provider uninstall
rebuild: clean all
--- cluster/clumon/src/cim-provider/Makefile 2005/12/07 22:55:04 1.5
+++ cluster/clumon/src/cim-provider/Makefile 2006/08/11 15:18:04 1.6
@@ -67,7 +67,7 @@
all: ${TARGET} $(TARGET_TEST)
-install:
+install: all
install -d ${pegasus_providers_dir}
install ${TARGET} ${pegasus_providers_dir}
--- cluster/clumon/src/daemon/Makefile 2005/11/29 23:50:02 1.3
+++ cluster/clumon/src/daemon/Makefile 2006/08/11 15:18:04 1.4
@@ -29,7 +29,7 @@
all: ${TARGET}
-install:
+install: all
install -d ${sbindir}
install ${TARGET} ${sbindir}
--- cluster/clumon/src/snmp-agent/Makefile 2005/11/29 19:57:35 1.4
+++ cluster/clumon/src/snmp-agent/Makefile 2006/08/11 15:18:04 1.5
@@ -43,7 +43,7 @@
all: ${TARGET}
-install:
+install: all
install -d ${libdir}/clumon-snmp
install ${TARGET} ${libdir}/clumon-snmp
--- cluster/cman/Makefile 2006/05/19 14:41:35 1.9
+++ cluster/cman/Makefile 2006/08/11 15:18:04 1.10
@@ -12,38 +12,32 @@
###############################################################################
all:
- cd lib && ${MAKE} all
- cd cman_tool && ${MAKE} all
- cd daemon && ${MAKE} all
- cd qdisk && ${MAKE} all
-
-copytobin:
- cd lib && ${MAKE} copytobin
- cd cman_tool && ${MAKE} copytobin
- cd daemon && ${MAKE} copytobin
- cd qdisk && ${MAKE} copytobin
+ ${MAKE} -C lib all
+ ${MAKE} -C cman_tool all
+ ${MAKE} -C daemon all
+ ${MAKE} -C qdisk all
clean:
- cd bin && ${MAKE} clean
- cd lib && ${MAKE} clean
- cd cman_tool && ${MAKE} clean
- cd daemon && ${MAKE} clean
- cd qdisk && ${MAKE} clean
+ ${MAKE} -C lib clean
+ ${MAKE} -C cman_tool clean
+ ${MAKE} -C daemon clean
+ ${MAKE} -C qdisk clean
distclean: clean
rm -f make/defines.mk
-install:
- cd lib && ${MAKE} install
- cd cman_tool && ${MAKE} install
- cd man && ${MAKE} install
- cd daemon && ${MAKE} install
- cd qdisk && ${MAKE} install
- cd init.d && ${MAKE} install
+install: all
+ ${MAKE} -C lib install
+ ${MAKE} -C cman_tool install
+ ${MAKE} -C daemon install
+ ${MAKE} -C qdisk install
+ ${MAKE} -C init.d install
+ ${MAKE} -C man install
uninstall:
- cd cman_tool && ${MAKE} uninstall
- cd man && ${MAKE} uninstall
- cd lib && ${MAKE} uninstall
- cd qdisk && ${MAKE} uninstall
- cd init.d && ${MAKE} uninstall
+ ${MAKE} -C lib uninstall
+ ${MAKE} -C cman_tool uninstall
+ ${MAKE} -C daemon uninstall
+ ${MAKE} -C qdisk uninstall
+ ${MAKE} -C init.d uninstall
+ ${MAKE} -C man uninstall
--- cluster/cman/configure 2006/07/07 06:58:20 1.8
+++ cluster/cman/configure 2006/08/11 15:18:04 1.9
@@ -14,6 +14,7 @@
###############################################################################
use Getopt::Long;
+use POSIX;
print "\nConfiguring Makefiles for your system...\n";
@@ -88,7 +89,13 @@
$ccsincdir="${incdir}/cluster";
}
if (!$libdir) {
- $libdir="${prefix}/usr/lib";
+ my $arch = (POSIX::uname())[4];
+ if ($arch eq "x86_64") {
+ $libdir="${prefix}/usr/lib64";
+ }
+ else {
+ $libdir="${prefix}/usr/lib";
+ }
}
if (!$libexecdir) {
$libexecdir="${prefix}/usr/libexec";
--- cluster/cman/cman_tool/Makefile 2006/07/03 12:13:55 1.17
+++ cluster/cman/cman_tool/Makefile 2006/08/11 15:18:04 1.18
@@ -28,9 +28,6 @@
all: ${TARGET}
-copytobin: all
- cp ${TARGET} ${top_srcdir}/bin
-
cman_tool: main.o join.o ../lib/libcman.a
$(CC) $(LDFLAGS) -L$(ccslibdir) -o $@ $^ -L../lib -lccs
@@ -40,7 +37,7 @@
join.o: join.c cman_tool.h
$(CC) $(CFLAGS) -c -o $@ $< -DSBINDIR=\"${sbindir}\"
-install: cman_tool
+install: all
install -d ${sbindir}
install cman_tool ${sbindir}
--- cluster/cman/daemon/Makefile 2006/07/07 07:53:14 1.46
+++ cluster/cman/daemon/Makefile 2006/08/11 15:18:04 1.47
@@ -29,9 +29,6 @@
all: ${TARGET}
-copytobin: all
- cp ${TARGET} ${top_srcdir}/bin
-
service_cman.lcrso: ${CMAN_OBJS}
$(CC) $(CFLAGS) -shared -Wl,-soname,service_cman.lcrso -o $@ ${CMAN_OBJS} -L../lib -L${ccslibdir} -lccs
@@ -60,7 +57,7 @@
logging.o: logging.c list.h cnxman-socket.h cnxman-private.h
$(CC) $(CFLAGS) -c -o $@ $<
-install:
+install: all
install -d ${libexecdir}/lcrso
install -s service_cman.lcrso ${libexecdir}/lcrso
--- cluster/cman/init.d/Makefile 2006/05/19 14:41:35 1.2
+++ cluster/cman/init.d/Makefile 2006/08/11 15:18:05 1.3
@@ -18,7 +18,7 @@
include ${top_srcdir}/make/defines.mk
-copytobin:
+all:
clean:
--- cluster/cman/lib/Makefile 2005/09/15 13:26:24 1.6
+++ cluster/cman/lib/Makefile 2006/08/11 15:18:05 1.7
@@ -37,9 +37,6 @@
libcman.o: libcman.c
$(CC) $(CFLAGS) -c -o $@ $< -I../daemon
-copytobin: all
-
-
install: all
install -d ${incdir}
install libcman.h ${incdir}
--- cluster/cman/qdisk/Makefile 2006/06/23 21:32:45 1.5
+++ cluster/cman/qdisk/Makefile 2006/08/11 15:18:05 1.6
@@ -23,10 +23,7 @@
all: ${TARGET}
-copytobin: all
- cp ${TARGET} ${top_srcdir}/bin
-
-install: ${TARGET}
+install: all
install -d ${sbindir}
install ${TARGET} ${sbindir}
--- cluster/cman/tests/Makefile 2006/05/11 10:35:25 1.4
+++ cluster/cman/tests/Makefile 2006/08/11 15:18:05 1.5
@@ -16,6 +16,8 @@
.c:
$(CC) $(CFLAGS) $(OUTPUT_OPTION) $< $(LDFLAGS)
+install: all
+
clean:
rm -f *.o ${TARGET}
--- cluster/cmirror/Makefile 2004/11/17 04:07:56 1.1
+++ cluster/cmirror/Makefile 2006/08/11 15:18:05 1.2
@@ -1,14 +1,14 @@
all:
- cd src && ${MAKE} all
+ ${MAKE} -C src all
clean:
- cd src && ${MAKE} clean
+ ${MAKE} -C src clean
-install:
- cd src && ${MAKE} install
+install: all
+ ${MAKE} -C src install
uninstall:
- cd src && ${MAKE} uninstall
+ ${MAKE} -C src uninstall
distclean: clean
rm -f make/defines.mk
--- cluster/csnap/Makefile 2006/03/08 18:13:37 1.14
+++ cluster/csnap/Makefile 2006/08/11 15:18:05 1.15
@@ -1,15 +1,15 @@
all:
- cd src && ${MAKE} copytobin
+ ${MAKE} -C src all
clean:
- cd src && ${MAKE} clean
- cd tests && ${MAKE} clean
+ ${MAKE} -C src clean
+ ${MAKE} -C tests clean
-install:
- cd bin && ${MAKE} install
+install: all
+ ${MAKE} -C src install
uninstall:
- cd bin && ${MAKE} uninstall
+ ${MAKE} -C src uninstall
distclean: clean
rm -f make/defines.mk
--- cluster/csnap/src/Makefile 2006/03/08 18:13:38 1.1
+++ cluster/csnap/src/Makefile 2006/08/11 15:18:05 1.2
@@ -34,8 +34,12 @@
cc -Wall create.c -DCREATE -o csnap-create -lpopt
cc -Wall create.c -DDELETE -o csnap-delete -lpopt
-copytobin: all
- cp $(binaries) $(top_srcdir)/bin
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ strip ${TARGET}
+ install -m755 ${binaries} ${sbindir}
clean:
rm -f $(binaries) *.o a.out
--- cluster/csnap-kernel/Makefile 2006/03/07 23:21:12 1.1
+++ cluster/csnap-kernel/Makefile 2006/08/11 15:18:06 1.2
@@ -1,14 +1,14 @@
all:
- cd src && ${MAKE} all
+ ${MAKE} -C src all
clean:
- cd src && ${MAKE} clean
+ ${MAKE} -C src clean
-install:
- cd src && ${MAKE} install
+install: all
+ ${MAKE} -C src install
uninstall:
- cd src && ${MAKE} uninstall
+ ${MAKE} -C src uninstall
distclean: clean
- rm -f make/defines.mk
\ No newline@end of file
+ rm -f make/defines.mk
--- cluster/csnap-kernel/src/Makefile 2006/03/07 23:21:12 1.1
+++ cluster/csnap-kernel/src/Makefile 2006/08/11 15:18:06 1.2
@@ -24,17 +24,15 @@
PATCH_TARGET = dm-csnap.patch
PWD := $(shell pwd)
-
+
obj-m := dm-csnap.o
csnap-objs := dm-csnap.c
EXTRA_CFLAGS += -I$(obj) -Idrivers/md
all:
- rm -f linux
- ln -s . linux
${MAKE} -C ${KERNEL_SRC} M=${PWD} modules USING_KBUILD=yes
-
+
install: all
install -d ${incdir}/linux
install dm-csnap.h ${incdir}/linux
--- cluster/ddraid/Makefile 2005/06/14 04:52:55 1.1
+++ cluster/ddraid/Makefile 2006/08/11 15:18:06 1.2
@@ -41,7 +41,7 @@
clean:
rm -f $(binaries) *.o a.out
-install:
+install: all
cp $(binaries) /usr/bin
kernel:
--- cluster/dlm/Makefile 2006/06/12 16:53:27 1.6
+++ cluster/dlm/Makefile 2006/08/11 15:18:06 1.7
@@ -12,21 +12,17 @@
###############################################################################
all:
- cd lib && ${MAKE} all
+ ${MAKE} -C lib all
-copytobin:
- cd lib && ${MAKE} copytobin
-
-install:
- cd lib && ${MAKE} install
+install: all
+ ${MAKE} -C lib install
uninstall:
- cd lib && ${MAKE} uninstall
+ ${MAKE} -C lib uninstall
clean:
- cd lib && ${MAKE} clean
+ ${MAKE} -C lib clean
rm -f *~
distclean: clean
rm -f make/defines.mk
-
--- cluster/dlm/lib/Makefile 2006/07/10 18:25:15 1.15
+++ cluster/dlm/lib/Makefile 2006/08/11 15:18:06 1.16
@@ -31,31 +31,28 @@
$(LIBNAME).a: libdlm.o libaislock.o
${AR} cr libdlm.a $^
${RANLIB} libdlm.a
-
+
$(LIBNAME)_lt.a: libdlm_lt.o
${AR} r libdlm_lt.a $^
${RANLIB} libdlm_lt.a
-
+
$(LIBNAME).so.${RELEASE_MAJOR}.${RELEASE_MINOR}: libdlm.po libaislock.po
$(CC) $(LDFLAGS) -shared -o $@ -Wl,-soname=$(LIBNAME).so.$(RELEASE_MAJOR) $^
-
+
$(LIBNAME)_lt.so.${RELEASE_MAJOR}.${RELEASE_MINOR}: libdlm_lt.po
$(CC) $(LDFLAGS) -shared -o $@ -Wl,-soname=$(LIBNAME)_lt.so.$(RELEASE_MAJOR) $^
-
+
%_lt.o: %.c
$(CC) $(CFLAGS) -c -o $@ $<
-
+
%_lt.po: %.c
$(CC) $(CFLAGS) -fPIC -c -o $@ $<
-
+
%.o: %.c
$(CC) $(CFLAGS) -D_REENTRANT -c -o $@ $<
-
+
%.po: %.c
$(CC) $(CFLAGS) -fPIC -D_REENTRANT -c -o $@ $<
-
-copytobin: all
-
install: all
install -d ${incdir}
--- cluster/dlm/tests/usertest/Makefile 2006/05/11 12:29:11 1.4
+++ cluster/dlm/tests/usertest/Makefile 2006/08/11 15:18:06 1.5
@@ -43,6 +43,3 @@
clean:
rm -f *.o $(BINARIES) *~ core
-
-copytobin:
-
--- cluster/doc/usage.txt 2006/07/31 22:35:32 1.32
+++ cluster/doc/usage.txt 2006/08/11 15:18:06 1.33
@@ -21,31 +21,25 @@
Compile kernel with GFS2, DLM, configfs, IPV6 and SCTP.
-Build and install the latest openais development tarball from
+Build and install the latest openais development from
http://developer.osdl.org/dev/openais/
- useradd -u 39 ais
- cd branches/whitetank
+or install subversion and type:
+ svn checkout http://svn.osdl.org/openais
+Then:
+ cd /path/to/openais/branches/whitetank
make; make install DESTDIR=/
Build and install the latest libvolume_id from the udev tarball
http://www.us.kernel.org/pub/linux/utils/kernel/hotplug/udev-094.tar.bz2
make EXTRAS="extras/volume_id" install
-Build and install from cluster tree. Various parts of the tree aren't
-updated yet, so just build the minimum bits shown here.
+Build and install from the cluster CVS tree:
cd cluster
./configure --kernel_src=/path/to/kernel
-
- cd cluster/cman/lib; make; make install
- cd cluster/ccs; make; make install
- cd cluster/cman; make; make install
- cd cluster/dlm; make; make install
- cd cluster/group; make; make install
- cd cluster/fence; make; make install
- cd cluster/gfs2; make; make install
- cd cluster/gfs-kernel; make; make install
- cd cluster/gfs; make; make install
+ make ; make install
+ depmod -a
+(New kernel module dependencies aren't automatically generated)
To build LVM2 & clvm:
@@ -61,7 +55,7 @@
modprobe lock_dlm
modprobe lock_nolock
modprobe dlm
-
+modprobe gfs
Configuration
-------------
--- cluster/fence/Makefile 2006/06/29 18:58:31 1.6
+++ cluster/fence/Makefile 2006/08/11 15:18:06 1.7
@@ -10,28 +10,34 @@
##
###############################################################################
###############################################################################
-all: copytobin
-
-copytobin:
- cd agents && ${MAKE} copytobin
- cd fence_node && ${MAKE} copytobin
- cd fence_tool && ${MAKE} copytobin
- cd fenced && ${MAKE} copytobin
+all:
+ ${MAKE} -C agents all
+ ${MAKE} -C fence_node all
+ ${MAKE} -C fence_tool all
+ ${MAKE} -C fenced all
clean:
- cd agents && ${MAKE} clean
- cd bin && ${MAKE} clean
- cd fence_node && ${MAKE} clean
- cd fence_tool && ${MAKE} clean
- cd fenced && ${MAKE} clean
+ ${MAKE} -C agents clean
+ ${MAKE} -C fence_node clean
+ ${MAKE} -C fence_tool clean
+ ${MAKE} -C fenced clean
distclean: clean
rm -f make/defines.mk
-install:
- cd bin && ${MAKE} install
- cd man && ${MAKE} install
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ ${MAKE} -C agents install
+ ${MAKE} -C fence_node install
+ ${MAKE} -C fence_tool install
+ ${MAKE} -C fenced install
+ ${MAKE} -C man install
uninstall:
- cd bin && ${MAKE} uninstall
- cd man && ${MAKE} uninstall
+ ${MAKE} -C agents uninstall
+ ${MAKE} -C fence_node uninstall
+ ${MAKE} -C fence_tool uninstall
+ ${MAKE} -C fenced uninstall
+ ${MAKE} -C man uninstall
--- cluster/fence/agents/Makefile 2006/07/20 15:06:17 1.12
+++ cluster/fence/agents/Makefile 2006/08/11 15:18:07 1.13
@@ -13,74 +13,73 @@
all:
- cd apc && ${MAKE} all
- cd bladecenter && ${MAKE} all
- cd brocade && ${MAKE} all
- cd bullpap && ${MAKE} all
- # cd cpint && ${MAKE} all
- cd drac && ${MAKE} all
- cd egenera && ${MAKE} all
- # cd ibmblade && ${MAKE} all
- cd ilo && ${MAKE} all
- cd ipmilan && ${MAKE} all
- cd manual && ${MAKE} all
- cd mcdata && ${MAKE} all
- # cd rackswitch && ${MAKE} all
- cd rps10 && ${MAKE} all
- cd rsa && ${MAKE} all
- cd rsb && ${MAKE} all
- cd scsi && ${MAKE} all
- cd sanbox2 && ${MAKE} all
- cd vixel && ${MAKE} all
- cd wti && ${MAKE} all
- # cd xcat && ${MAKE} all
- # cd zvm && ${MAKE} all
+ ${MAKE} -C apc all
+ ${MAKE} -C bladecenter all
+ ${MAKE} -C brocade all
+ ${MAKE} -C bullpap all
+ # ${MAKE} -C cpint all
+ ${MAKE} -C drac all
+ ${MAKE} -C egenera all
+ # ${MAKE} -C ibmblade all
+ ${MAKE} -C ilo all
+ ${MAKE} -C ipmilan all
+ ${MAKE} -C manual all
+ ${MAKE} -C mcdata all
+ # ${MAKE} -C rackswitch all
+ ${MAKE} -C rps10 all
+ ${MAKE} -C rsa all
+ ${MAKE} -C rsb all
+ ${MAKE} -C scsi all
+ ${MAKE} -C sanbox2 all
+ ${MAKE} -C vixel all
+ ${MAKE} -C wti all
+ # ${MAKE} -C xcat all
+ # ${MAKE} -C zvm all
-copytobin:
- cd apc && ${MAKE} copytobin
- cd bladecenter && ${MAKE} copytobin
- cd brocade && ${MAKE} copytobin
- cd bullpap && ${MAKE} copytobin
- # cd cpint && ${MAKE} copytobin
- cd drac && ${MAKE} copytobin
- cd egenera && ${MAKE} copytobin
- # cd ibmblade && ${MAKE} copytobin
- cd ilo && ${MAKE} copytobin
- cd ipmilan && ${MAKE} copytobin
- cd manual && ${MAKE} copytobin
- cd mcdata && ${MAKE} copytobin
- # cd rackswitch && ${MAKE} copytobin
- cd rps10 && ${MAKE} copytobin
- cd rsa && ${MAKE} copytobin
- cd rsb && ${MAKE} copytobin
- cd scsi && ${MAKE} copytobin
- cd sanbox2 && ${MAKE} copytobin
- cd vixel && ${MAKE} copytobin
- cd wti && ${MAKE} copytobin
- # cd xcat && ${MAKE} copytobin
- # cd zvm && ${MAKE} copytobin
+install: all
+ ${MAKE} -C apc install
+ ${MAKE} -C bladecenter install
+ ${MAKE} -C brocade install
+ ${MAKE} -C bullpap install
+ # ${MAKE} -C cpint install
+ ${MAKE} -C drac install
+ ${MAKE} -C egenera install
+ # ${MAKE} -C ibmblade install
+ ${MAKE} -C ilo install
+ ${MAKE} -C ipmilan install
+ ${MAKE} -C manual install
+ ${MAKE} -C mcdata install
+ # ${MAKE} -C rackswitch install
+ ${MAKE} -C rps10 install
+ ${MAKE} -C rsa install
+ ${MAKE} -C rsb install
+ ${MAKE} -C scsi install
+ ${MAKE} -C sanbox2 install
+ ${MAKE} -C vixel install
+ ${MAKE} -C wti install
+ # ${MAKE} -C xcat install
+ # ${MAKE} -C zvm install
clean:
- cd apc && ${MAKE} clean
- cd bladecenter && ${MAKE} clean
- cd brocade && ${MAKE} clean
- cd bullpap && ${MAKE} clean
- #cd cpint && ${MAKE} clean
- cd drac && ${MAKE} clean
- cd egenera && ${MAKE} clean
- # cd ibmblade && ${MAKE} clean
- cd ilo && ${MAKE} clean
- cd ipmilan && ${MAKE} clean
- cd manual && ${MAKE} clean
- cd mcdata && ${MAKE} clean
- # cd rackswitch && ${MAKE} clean
- cd rps10 && ${MAKE} clean
- cd rsa && ${MAKE} clean
- cd rsb && ${MAKE} clean
- cd scsi && ${MAKE} clean
- cd sanbox2 && ${MAKE} clean
- cd vixel && ${MAKE} clean
- cd wti && ${MAKE} clean
- # cd xcat && ${MAKE} clean
- # cd zvm && ${MAKE} clean
-
+ ${MAKE} -C apc clean
+ ${MAKE} -C bladecenter clean
+ ${MAKE} -C brocade clean
+ ${MAKE} -C bullpap clean
+ # ${MAKE} -C cpint clean
+ ${MAKE} -C drac clean
+ ${MAKE} -C egenera clean
+ # ${MAKE} -C ibmblade clean
+ ${MAKE} -C ilo clean
+ ${MAKE} -C ipmilan clean
+ ${MAKE} -C manual clean
+ ${MAKE} -C mcdata clean
+ # ${MAKE} -C rackswitch clean
+ ${MAKE} -C rps10 clean
+ ${MAKE} -C rsa clean
+ ${MAKE} -C rsb clean
+ ${MAKE} -C scsi clean
+ ${MAKE} -C sanbox2 clean
+ ${MAKE} -C vixel clean
+ ${MAKE} -C wti clean
+ # ${MAKE} -C xcat clean
+ # ${MAKE} -C zvm clean
--- cluster/fence/agents/apc/Makefile 2004/06/24 08:53:12 1.1
+++ cluster/fence/agents/apc/Makefile 2006/08/11 15:18:07 1.2
@@ -28,8 +28,11 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
chmod +x $(TARGET)
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin/${TARGET}
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f $(TARGET)
--- cluster/fence/agents/baytech/Makefile 2004/06/24 08:53:13 1.1
+++ cluster/fence/agents/baytech/Makefile 2006/08/11 15:18:07 1.2
@@ -29,8 +29,11 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
chmod +x $(TARGET)
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin/${TARGET}
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f $(TARGET)
--- cluster/fence/agents/bladecenter/Makefile 2005/01/11 22:38:47 1.2
+++ cluster/fence/agents/bladecenter/Makefile 2006/08/11 15:18:07 1.3
@@ -28,8 +28,11 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
chmod +x $(TARGET)
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin/${TARGET}
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f $(TARGET)
--- cluster/fence/agents/brocade/Makefile 2004/06/24 08:53:13 1.1
+++ cluster/fence/agents/brocade/Makefile 2006/08/11 15:18:07 1.2
@@ -28,8 +28,11 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
chmod +x $(TARGET)
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin/${TARGET}
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f $(TARGET)
--- cluster/fence/agents/bullpap/Makefile 2005/03/01 14:51:45 1.2
+++ cluster/fence/agents/bullpap/Makefile 2006/08/11 15:18:07 1.3
@@ -28,8 +28,11 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
chmod +x $(TARGET)
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin/${TARGET}
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f $(TARGET)
--- cluster/fence/agents/cpint/Makefile 2004/06/24 08:53:13 1.1
+++ cluster/fence/agents/cpint/Makefile 2006/08/11 15:18:07 1.2
@@ -28,8 +28,11 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
chmod +x $(TARGET)
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin/${TARGET}
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f $(TARGET)
--- cluster/fence/agents/drac/Makefile 2005/06/28 15:09:07 1.1
+++ cluster/fence/agents/drac/Makefile 2006/08/11 15:18:07 1.2
@@ -28,8 +28,11 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
chmod +x $(TARGET)
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin/${TARGET}
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f $(TARGET)
--- cluster/fence/agents/egenera/Makefile 2004/06/24 08:53:13 1.1
+++ cluster/fence/agents/egenera/Makefile 2006/08/11 15:18:07 1.2
@@ -28,8 +28,11 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
chmod +x $(TARGET)
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin/${TARGET}
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f $(TARGET)
--- cluster/fence/agents/ibmblade/Makefile 2004/08/24 16:05:36 1.1
+++ cluster/fence/agents/ibmblade/Makefile 2006/08/11 15:18:07 1.2
@@ -28,8 +28,11 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
chmod +x $(TARGET)
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin/${TARGET}
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f $(TARGET)
--- cluster/fence/agents/ilo/Makefile 2004/09/13 17:04:45 1.1
+++ cluster/fence/agents/ilo/Makefile 2006/08/11 15:18:08 1.2
@@ -28,8 +28,11 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
chmod +x $(TARGET)
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin/${TARGET}
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f $(TARGET)
--- cluster/fence/agents/ipmilan/Makefile 2005/03/01 14:51:45 1.2
+++ cluster/fence/agents/ipmilan/Makefile 2006/08/11 15:18:08 1.3
@@ -30,8 +30,11 @@
fence_ipmilan: ${fence_ipmilan_SOURCE:.c=.o}
${CC} ${CFLAGS} ${LDFLAGS} ${fence_ipmilan_SOURCE:.c=.o} -o $@
-copytobin: all
- cp ${TARGET} ${top_srcdir}/bin
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f *.o ${TARGET}
--- cluster/fence/agents/manual/Makefile 2006/06/20 18:23:25 1.6
+++ cluster/fence/agents/manual/Makefile 2006/08/11 15:18:08 1.7
@@ -39,8 +39,11 @@
ack.o: ack.c
$(CC) $(CFLAGS) -c -o $@ $<
-copytobin: all
- cp ${TARGET} ${top_srcdir}/bin
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f *.o ${TARGET}
--- cluster/fence/agents/mcdata/Makefile 2004/06/24 08:53:14 1.1
+++ cluster/fence/agents/mcdata/Makefile 2006/08/11 15:18:08 1.2
@@ -28,8 +28,11 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
chmod +x $(TARGET)
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin/${TARGET}
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f $(TARGET)
--- cluster/fence/agents/rackswitch/Makefile 2004/06/24 08:53:14 1.1
+++ cluster/fence/agents/rackswitch/Makefile 2006/08/11 15:18:08 1.2
@@ -31,9 +31,11 @@
fence_rackswitch: ${SOURCE:.c=.o}
${CC} ${CFLAGS} ${LDFLAGS} ${SOURCE:.c=.o} ${LOADLIBES} ${LDLIBS} -o $@
-copytobin: all
- cp ${TARGET} ${top_srcdir}/bin
-
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f *.o ${TARGET} *~
--- cluster/fence/agents/rps10/Makefile 2004/11/16 18:43:48 1.1
+++ cluster/fence/agents/rps10/Makefile 2006/08/11 15:18:08 1.2
@@ -30,8 +30,11 @@
fence_rps10: ${fence_rps10_SOURCE:.c=.o}
${CC} ${CFLAGS} ${LDFLAGS} ${fence_rps10_SOURCE:.c=.o} -o $@
-copytobin: all
- cp ${TARGET} ${top_srcdir}/bin
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f *.o ${TARGET}
--- cluster/fence/agents/rsa/Makefile 2006/02/06 16:34:26 1.2
+++ cluster/fence/agents/rsa/Makefile 2006/08/11 15:18:08 1.3
@@ -28,8 +28,11 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
chmod +x $(TARGET)
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin/${TARGET}
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f $(TARGET)
--- cluster/fence/agents/rsb/Makefile 2006/04/19 19:39:01 1.1
+++ cluster/fence/agents/rsb/Makefile 2006/08/11 15:18:08 1.2
@@ -28,8 +28,11 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
chmod +x $(TARGET)
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin/${TARGET}
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f $(TARGET)
--- cluster/fence/agents/sanbox2/Makefile 2004/08/24 16:05:37 1.1
+++ cluster/fence/agents/sanbox2/Makefile 2006/08/11 15:18:08 1.2
@@ -28,8 +28,11 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
chmod +x $(TARGET)
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin/${TARGET}
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f $(TARGET)
--- cluster/fence/agents/scsi/Makefile 2006/06/29 21:36:09 1.1
+++ cluster/fence/agents/scsi/Makefile 2006/08/11 15:18:09 1.2
@@ -27,8 +27,11 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
chmod +x $(TARGET)
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin/${TARGET}
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f $(TARGET)
--- cluster/fence/agents/vixel/Makefile 2004/06/24 08:53:15 1.1
+++ cluster/fence/agents/vixel/Makefile 2006/08/11 15:18:09 1.2
@@ -28,8 +28,11 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
chmod +x $(TARGET)
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin/${TARGET}
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f $(TARGET)
--- cluster/fence/agents/vmware/Makefile 2005/09/01 18:25:41 1.1
+++ cluster/fence/agents/vmware/Makefile 2006/08/11 15:18:09 1.2
@@ -28,8 +28,11 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
chmod +x $(TARGET)
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin/${TARGET}
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f $(TARGET)
--- cluster/fence/agents/wti/Makefile 2004/06/24 08:53:15 1.1
+++ cluster/fence/agents/wti/Makefile 2006/08/11 15:18:09 1.2
@@ -28,8 +28,11 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
chmod +x $(TARGET)
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin/${TARGET}
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f $(TARGET)
--- cluster/fence/agents/xcat/Makefile 2004/06/24 08:53:15 1.1
+++ cluster/fence/agents/xcat/Makefile 2006/08/11 15:18:09 1.2
@@ -23,8 +23,11 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
chmod +x $(TARGET)
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin/${TARGET}
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f $(TARGET)
--- cluster/fence/agents/xen/Makefile 2005/06/10 14:12:45 1.1
+++ cluster/fence/agents/xen/Makefile 2006/08/11 15:18:09 1.2
@@ -28,8 +28,11 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
chmod +x $(TARGET)
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin/${TARGET}
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f $(TARGET)
--- cluster/fence/agents/zvm/Makefile 2004/06/24 08:53:17 1.1
+++ cluster/fence/agents/zvm/Makefile 2006/08/11 15:18:09 1.2
@@ -28,8 +28,11 @@
awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
chmod +x $(TARGET)
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin/${TARGET}
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f $(TARGET)
--- cluster/fence/fence_node/Makefile 2006/04/25 13:51:54 1.4
+++ cluster/fence/fence_node/Makefile 2006/08/11 15:18:09 1.5
@@ -40,9 +40,12 @@
agent.c:
ln -s ${top_srcdir}/fenced/agent.c .
-copytobin: all
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
strip ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -rf *~ *.o ${TARGET} agent.c
--- cluster/fence/fence_tool/Makefile 2006/05/11 20:46:09 1.9
+++ cluster/fence/fence_tool/Makefile 2006/08/11 15:18:09 1.10
@@ -40,9 +40,12 @@
agent.c:
ln -s ${top_srcdir}/fenced/agent.c .
-copytobin: all
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
strip ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -rf *~ *.o ${TARGET} agent.c
--- cluster/fence/fenced/Makefile 2006/07/07 16:14:33 1.6
+++ cluster/fence/fenced/Makefile 2006/08/11 15:18:10 1.7
@@ -54,9 +54,12 @@
agent.o: agent.c fd.h
$(CC) $(CFLAGS) -c -o $@ $<
-copytobin: all
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
strip ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -rf *~ *.o ${TARGET}
--- cluster/fence/init.d/Makefile 2004/12/17 20:09:55 1.1
+++ cluster/fence/init.d/Makefile 2006/08/11 15:18:10 1.2
@@ -18,8 +18,6 @@
include ${top_srcdir}/make/defines.mk
-copytobin:
-
clean:
install:
--- cluster/gfs/Makefile 2006/07/14 18:04:01 1.8
+++ cluster/gfs/Makefile 2006/08/11 15:18:10 1.9
@@ -12,48 +12,52 @@
###############################################################################
all:
- cd libgfs && ${MAKE} all
- cd gfs_debug && ${MAKE} all
- cd gfs_edit && ${MAKE} all
- cd gfs_fsck && ${MAKE} all
- cd gfs_grow && ${MAKE} all
- cd gfs_jadd && ${MAKE} all
- cd gfs_mkfs && ${MAKE} all
- cd gfs_quota && ${MAKE} all
- cd gfs_tool && ${MAKE} all
-
-copytobin:
- cd gfs_debug && ${MAKE} copytobin
- cd gfs_edit && ${MAKE} copytobin
- cd gfs_fsck && ${MAKE} copytobin
- cd gfs_grow && ${MAKE} copytobin
- cd gfs_jadd && ${MAKE} copytobin
- cd gfs_mkfs && ${MAKE} copytobin
- cd gfs_quota && ${MAKE} copytobin
- cd gfs_tool && ${MAKE} copytobin
+ ${MAKE} -C libgfs all
+ ${MAKE} -C gfs_debug all
+ ${MAKE} -C gfs_edit all
+ ${MAKE} -C gfs_fsck all
+ ${MAKE} -C gfs_grow all
+ ${MAKE} -C gfs_jadd all
+ ${MAKE} -C gfs_mkfs all
+ ${MAKE} -C gfs_quota all
+ ${MAKE} -C gfs_tool all
clean:
- cd bin && ${MAKE} clean
- cd libgfs && ${MAKE} clean
- cd gfs_debug && ${MAKE} clean
- cd gfs_edit && ${MAKE} clean
- cd gfs_fsck && ${MAKE} clean
- cd gfs_grow && ${MAKE} clean
- cd gfs_jadd && ${MAKE} clean
- cd gfs_mkfs && ${MAKE} clean
- cd gfs_quota && ${MAKE} clean
- cd gfs_tool && ${MAKE} clean
+ ${MAKE} -C libgfs clean
+ ${MAKE} -C gfs_debug clean
+ ${MAKE} -C gfs_edit clean
+ ${MAKE} -C gfs_fsck clean
+ ${MAKE} -C gfs_grow clean
+ ${MAKE} -C gfs_jadd clean
+ ${MAKE} -C gfs_mkfs clean
+ ${MAKE} -C gfs_quota clean
+ ${MAKE} -C gfs_tool clean
distclean: clean
rm -f make/defines.mk
-install:
- cd bin && ${MAKE} install
- cd man && ${MAKE} install
- cd init.d && ${MAKE} install
+install: all
+ ${MAKE} -C libgfs install
+ ${MAKE} -C gfs_debug install
+ ${MAKE} -C gfs_edit install
+ ${MAKE} -C gfs_fsck install
+ ${MAKE} -C gfs_grow install
+ ${MAKE} -C gfs_jadd install
+ ${MAKE} -C gfs_mkfs install
+ ${MAKE} -C gfs_quota install
+ ${MAKE} -C gfs_tool install
+ ${MAKE} -C man install
+ ${MAKE} -C init.d install
deinstall uninstall:
- cd bin && ${MAKE} uninstall
- cd man && ${MAKE} uninstall
- cd init.d && ${MAKE} uninstall
-
+ ${MAKE} -C libgfs uninstall
+ ${MAKE} -C gfs_debug uninstall
+ ${MAKE} -C gfs_edit uninstall
+ ${MAKE} -C gfs_fsck uninstall
+ ${MAKE} -C gfs_grow uninstall
+ ${MAKE} -C gfs_jadd uninstall
+ ${MAKE} -C gfs_mkfs uninstall
+ ${MAKE} -C gfs_quota uninstall
+ ${MAKE} -C gfs_tool uninstall
+ ${MAKE} -C man uninstall
+ ${MAKE} -C init.d uninstall
--- cluster/gfs/configure 2005/05/19 19:51:06 1.5
+++ cluster/gfs/configure 2006/08/11 15:18:10 1.6
@@ -14,6 +14,7 @@
###############################################################################
use Getopt::Long;
+use POSIX;
print "\nConfiguring Makefiles for your system...\n";
@@ -26,10 +27,8 @@
help => \$help,
incdir => \$incdir,
gfskincdir => \$gfskincdir,
- iddevincdir => \$iddevincdir,
kernel_src => \$kernel_src,
libdir => \$libdir,
- iddevlibdir => \$iddevlibdir,
mandir => \$mandir,
prefix => \$prefix,
sbindir => \$sbindir,
@@ -40,10 +39,8 @@
'help',
'incdir=s',
'gfskincdir=s',
- 'iddevincdir=s',
'kernel_src=s',
'libdir=s',
- 'iddevlibdir=s',
'mandir=s',
'prefix=s',
'sbindir=s',
@@ -64,10 +61,8 @@
print "install flags:\n";
print "--incdir=\tthe base directory for include files. (Default: /usr/include)\n";
print "--gfskincdir=\tthe base directory for GFS kernel include files. (Default: {incdir}/cluster)\n";
- print "--iddevincdir=\tthe base directory for iddev include files. (Default: {incdir}/cluster)\n";
print "--kernel_src=\tthe directory containing the kernel source you wish to\n\t\tcompile against. (Default: system dependant)\n";
print "--libdir=\tthe base directory for libraries. (Default: /usr/lib)\n";
- print "--iddevlibdir=\tthe base directory for libraries. (Default: {libdir})\n";
print "--mandir=\tthe base directory for man pages. (Default: /usr/share/man)\n";
print "--prefix=\tthe base directory to install into. (Default: /)\n";
print "--sbindir=\tthe base directory for system binaries. (Default: /sbin)\n";
@@ -87,14 +82,14 @@
if (!$gfskincdir) {
$gfskincdir="${incdir}/cluster";
}
-if (!$iddevincdir) {
- $iddevincdir="${incdir}/cluster";
-}
if (!$libdir) {
- $libdir="${prefix}/usr/lib";
-}
-if (!$iddevlibdir) {
- $iddevlibdir="${libdir}";
+ my $arch = (POSIX::uname())[4];
+ if ($arch eq "x86_64") {
+ $libdir="${prefix}/usr/lib64";
+ }
+ else {
+ $libdir="${prefix}/usr/lib";
+ }
}
if (!$mandir) {
$mandir="${prefix}/usr/share/man";
@@ -117,10 +112,8 @@
$_ =~ s/\@CC\@/${CC}/;
$_ =~ s/\@INCDIR\@/$incdir/;
$_ =~ s/\@GFSKINCDIR\@/$gfskincdir/;
- $_ =~ s/\@IDDEVINCDIR\@/$iddevincdir/;
$_ =~ s/\@KERNEL_SRC\@/$kernel_src/;
$_ =~ s/\@LIBDIR\@/$libdir/;
- $_ =~ s/\@IDDEVLIBDIR\@/$iddevlibdir/;
$_ =~ s/\@MANDIR\@/$mandir/;
$_ =~ s/\@SBINDIR\@/$sbindir/;
$_ =~ s/\@SHAREDIR\@/$sharedir/;
--- cluster/gfs/gfs_debug/Makefile 2006/07/11 20:32:42 1.4
+++ cluster/gfs/gfs_debug/Makefile 2006/08/11 15:18:10 1.5
@@ -47,8 +47,11 @@
gfs_debug: ${SOURCE}
${CC} ${CFLAGS} ${INCLUDE} ${LDFLAGS} ${SOURCE} ${LOADLIBES} ${LDLIBS} -o $@
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f *.o ${TARGET}
--- cluster/gfs/gfs_edit/Makefile 2006/07/10 23:30:56 1.5
+++ cluster/gfs/gfs_edit/Makefile 2006/08/11 15:18:10 1.6
@@ -35,13 +35,16 @@
INCLUDE += -I${gfskincdir}
endif
-all: gfs_edit
+all: ${TARGET}
gfs_edit: ${SOURCE}
${CC} ${CFLAGS} ${INCLUDE} ${LDFLAGS} ${SOURCE} ${LOADLIBES} ${LDLIBS} -lncurses -o $@
-copytobin: all
- cp ${TARGET} ${top_srcdir}/bin
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f *.o ${TARGET}
--- cluster/gfs/gfs_fsck/Makefile 2006/07/19 14:11:53 1.5
+++ cluster/gfs/gfs_fsck/Makefile 2006/08/11 15:18:10 1.6
@@ -14,6 +14,8 @@
include ${top_srcdir}/make/defines.mk
+TARGET= gfs_fsck
+
INCLUDE= -I${top_srcdir}/include -I${top_srcdir}/config
.PHONY: all clean
@@ -27,7 +29,7 @@
CFLAGS+=-D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM -DGFS_RELEASE_NAME=\"${RELEASE}\" -Wall -g
-all: gfs_fsck
+all: ${TARGET}
gfs_fsck: $(sources:.c=.o)
$(CC) $(CFLAGS) $^ -o $@
@@ -44,8 +46,12 @@
clean:
@rm -f *.o *~ *.d gfs_fsck
-copytobin: gfs_fsck
- cp gfs_fsck ${top_srcdir}/bin
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
+ (cd ${sbindir}; ln -f gfs_fsck fsck.gfs)
distclean: clean
@rm -f cscope.* test_inode_list *.orig *.rej test_block_list test_bitmap
--- cluster/gfs/gfs_grow/Makefile 2006/07/10 23:34:18 1.5
+++ cluster/gfs/gfs_grow/Makefile 2006/08/11 15:18:10 1.6
@@ -39,11 +39,14 @@
all: ${TARGET}
-gfs_grow:
+gfs_grow: ${top_srcdir}/libgfs/libgfs.a
${CC} ${CFLAGS} ${INCLUDE} main.c ondisk.c ${LDFLAGS} ${LOADLIBS} -o $@
-copytobin: all
- cp ${TARGET} ${top_srcdir}/bin
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f *.o ${TARGET}
--- cluster/gfs/gfs_jadd/Makefile 2006/07/10 23:35:48 1.5
+++ cluster/gfs/gfs_jadd/Makefile 2006/08/11 15:18:10 1.6
@@ -40,11 +40,14 @@
all: ${TARGET}
-gfs_jadd:
+gfs_jadd: ${top_srcdir}/libgfs/libgfs.a
${CC} ${CFLAGS} ${INCLUDE} ${LDFLAGS} ${SOURCE} ${LOADLIBES} ${LDLIBS} -o $@
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f *.o ${TARGET}
--- cluster/gfs/gfs_mkfs/Makefile 2006/07/10 23:39:35 1.5
+++ cluster/gfs/gfs_mkfs/Makefile 2006/08/11 15:18:11 1.6
@@ -44,11 +44,15 @@
all: ${TARGET}
-gfs_mkfs: ${SOURCE}
+gfs_mkfs: ${SOURCE} ${top_srcdir}/libgfs/libgfs.a
${CC} ${CFLAGS} ${INCLUDE} ${LDFLAGS} ${SOURCE} ${LOADLIBES} ${LDLIBS} -o $@ -lgfs -lvolume_id
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
+ (cd ${sbindir}; ln -f gfs_mkfs mkfs.gfs)
clean:
rm -f *.o ${TARGET}
--- cluster/gfs/gfs_quota/Makefile 2005/05/19 19:51:08 1.4
+++ cluster/gfs/gfs_quota/Makefile 2006/08/11 15:18:11 1.5
@@ -41,8 +41,11 @@
gfs_quota: ${SOURCE}
${CC} ${CFLAGS} ${INCLUDE} ${LDFLAGS} ${SOURCE} ${LOADLIBES} ${LDLIBS} -o $@
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f *.o ${TARGET}
--- cluster/gfs/gfs_tool/Makefile 2005/05/19 19:51:09 1.8
+++ cluster/gfs/gfs_tool/Makefile 2006/08/11 15:18:11 1.9
@@ -45,8 +45,11 @@
gfs_tool: ${SOURCE}
${CC} ${CFLAGS} ${INCLUDE} ${LDFLAGS} ${SOURCE} ${LOADLIBES} ${LDLIBS} -o $@
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f *.o ${TARGET}
--- cluster/gfs/init.d/Makefile 2004/12/17 20:11:56 1.1
+++ cluster/gfs/init.d/Makefile 2006/08/11 15:18:11 1.2
@@ -18,8 +18,6 @@
include ${top_srcdir}/make/defines.mk
-copytobin:
-
clean:
install:
--- cluster/gfs/libgfs/Makefile 2006/07/10 23:28:11 1.2
+++ cluster/gfs/libgfs/Makefile 2006/08/11 15:18:11 1.3
@@ -39,5 +39,7 @@
.c.o: $<
${CC} ${CFLAGS} -o $@ $^
+install: all
+
clean:
rm -f *.o ${LIBGFS}
--- cluster/gfs/make/gfs.spec.in 2004/11/04 22:27:13 1.1
+++ cluster/gfs/make/gfs.spec.in 2006/08/11 15:18:11 1.2
@@ -19,7 +19,6 @@
Group: System Environment/Kernel
Summary: GFS - The Global File System
BuildRequires: GFS-kernheaders >= 2.6.9
-BuildRequires: iddev-devel
Source0: gfs-%{version}-%{release}.tar.gz
--- cluster/gfs-kernel/Makefile 2004/06/24 17:26:13 1.1
+++ cluster/gfs-kernel/Makefile 2006/08/11 15:18:12 1.2
@@ -1,14 +1,14 @@
all:
- cd src && ${MAKE} all
+ ${MAKE} -C src all
clean:
- cd src && ${MAKE} clean
+ ${MAKE} -C src clean
-install:
- cd src && ${MAKE} install
+install: all
+ ${MAKE} -C src install
uninstall:
- cd src && ${MAKE} uninstall
+ ${MAKE} -C src uninstall
distclean: clean
- rm -f make/defines.mk
\ No newline at end of file
+ rm -f make/defines.mk
--- cluster/gfs-kernel/src/Makefile 2006/07/13 21:10:41 1.4
+++ cluster/gfs-kernel/src/Makefile 2006/08/11 15:18:12 1.5
@@ -12,19 +12,19 @@
###############################################################################
all:
- cd gfs && ${MAKE} all
+ ${MAKE} -C gfs all
install:
- cd gfs && ${MAKE} install
+ ${MAKE} -C gfs install
uninstall:
- cd gfs && ${MAKE} uninstall
+ ${MAKE} -C gfs uninstall
clean:
rm -rf *.patch linux-patched
- cd gfs && ${MAKE} clean
-
-patches:
- cd gfs && ${MAKE} patches
+ ${MAKE} -C gfs clean
+distclean: clean
+patches:
+ ${MAKE} -C gfs patches
--- cluster/gfs-kernel/src/dlm/Makefile 2006/01/09 21:27:28 1.11
+++ cluster/gfs-kernel/src/dlm/Makefile 2006/08/11 15:18:12 1.12
@@ -36,7 +36,6 @@
EXTRA_CFLAGS += -I$(obj)
all:
- if [ ! -e linux ]; then ln -s . linux; fi
if [ ! -e dlm.h ]; then cp ../../../dlm-kernel/src2/dlm.h .; fi
${MAKE} -C ${KERNEL_SRC} M=${PWD} modules USING_KBUILD=yes
--- cluster/gfs-kernel/src/harness/Makefile 2005/07/27 09:12:18 1.4
+++ cluster/gfs-kernel/src/harness/Makefile 2006/08/11 15:18:12 1.5
@@ -30,18 +30,14 @@
EXTRA_CFLAGS += -I$(obj)
all:
- rm -f linux
- ln -s . linux
${MAKE} -C ${KERNEL_SRC} M=${PWD} modules USING_KBUILD=yes
install: all
install -d ${incdir}/linux
- install lm_interface.h ${incdir}/linux
install -d ${module_dir}/fs/gfs_locking/lock_harness
install lock_harness.ko ${module_dir}/fs/gfs_locking/lock_harness
uninstall:
- ${UNINSTALL} lm_interface.h ${incdir}/linux
${UNINSTALL} lock_harness.ko ${module_dir}/fs/gfs_locking/lock_harness
clean:
--- cluster/gfs-kernel/src/nolock/Makefile 2006/01/09 21:27:28 1.5
+++ cluster/gfs-kernel/src/nolock/Makefile 2006/08/11 15:18:12 1.6
@@ -31,8 +31,6 @@
EXTRA_CFLAGS += -I$(obj)
all:
- rm -f linux
- ln -s . linux
${MAKE} -C ${KERNEL_SRC} M=${PWD} modules USING_KBUILD=yes
install: all
--- cluster/gfs2/Makefile 2006/07/24 17:48:50 1.8
+++ cluster/gfs2/Makefile 2006/08/11 15:18:12 1.9
@@ -30,14 +30,6 @@
tag_tool:
${MAKE} -C tool all
-copytobin:
- ${MAKE} -C convert copytobin
- ${MAKE} -C edit copytobin
- ${MAKE} -C fsck copytobin
- ${MAKE} -C mkfs copytobin
- ${MAKE} -C quota copytobin
- ${MAKE} -C tool copytobin
-
clean:
${MAKE} -C libgfs2 clean
${MAKE} -C convert clean
@@ -47,19 +39,28 @@
${MAKE} -C mount clean
${MAKE} -C quota clean
${MAKE} -C tool clean
- ${MAKE} -C bin clean
distclean: clean
rm -f make/defines.mk
-install:
- ${MAKE} -C mount install
- ${MAKE} -C bin install
- ${MAKE} -C man install
+install: all
+ ${MAKE} -C convert install
+ ${MAKE} -C edit install
+ ${MAKE} -C fsck install
${MAKE} -C init.d install
+ ${MAKE} -C man install
+ ${MAKE} -C mkfs install
+ ${MAKE} -C mount install
+ ${MAKE} -C quota install
+ ${MAKE} -C tool install
deinstall uninstall:
- ${MAKE} -C mount uninstall
- ${MAKE} -C bin uninstall
- ${MAKE} -C man uninstall
+ ${MAKE} -C convert uninstall
+ ${MAKE} -C edit uninstall
+ ${MAKE} -C fsck uninstall
${MAKE} -C init.d uninstall
+ ${MAKE} -C man uninstall
+ ${MAKE} -C mkfs uninstall
+ ${MAKE} -C mount uninstall
+ ${MAKE} -C quota uninstall
+ ${MAKE} -C tool uninstall
--- cluster/gfs2/configure 2005/05/19 19:51:11 1.2
+++ cluster/gfs2/configure 2006/08/11 15:18:12 1.3
@@ -14,6 +14,7 @@
###############################################################################
use Getopt::Long;
+use POSIX;
print "\nConfiguring Makefiles for your system...\n";
@@ -25,11 +26,9 @@
%options = (
help => \$help,
incdir => \$incdir,
- iddevincdir => \$iddevincdir,
gfs2kincdir => \$gfs2kincdir,
kernel_src => \$kernel_src,
libdir => \$libdir,
- iddevlibdir => \$iddevlibdir,
mandir => \$mandir,
prefix => \$prefix,
sbindir => \$sbindir,
@@ -39,11 +38,9 @@
$err = &GetOptions (\%options,
'help',
'incdir=s',
- 'iddevincdir=s',
'gfs2kincdir=s',
'kernel_src=s',
'libdir=s',
- 'iddevlibdir=s',
'mandir=s',
'prefix=s',
'sbindir=s',
@@ -64,10 +61,8 @@
print "install flags:\n";
print "--incdir=\tthe base directory for include files. (Default: /usr/include)\n";
print "--gfs2kincdir=\tthe base directory for gfs2-kernel include files. (Default: {incdir}/cluster)\n";
- print "--iddevincdir=\tthe base directory for iddev include files. (Default: {incdir}/cluster)\n";
print "--kernel_src=\tthe directory containing the kernel source you wish to\n\t\tcompile against. (Default: system dependant)\n";
print "--libdir=\tthe base directory for libraries. (Default: /usr/lib)\n";
- print "--iddevlibdir=\tthe base directory for iddev libraries. (Default: {libdir})\n";
print "--mandir=\tthe base directory for man pages. (Default: /usr/share/man)\n";
print "--prefix=\tthe base directory to install into. (Default: /)\n";
print "--sbindir=\tthe base directory for system binaries. (Default: /sbin)\n";
@@ -87,14 +82,14 @@
if (!$gfs2kincdir) {
$gfs2kincdir="${incdir}/cluster";
}
-if (!$iddevincdir) {
- $iddevincdir="${incdir}/cluster";
-}
if (!$libdir) {
- $libdir="${prefix}/usr/lib";
-}
-if (!$iddevlibdir) {
- $iddevlibdir="${libdir}";
+ my $arch = (POSIX::uname())[4];
+ if ($arch eq "x86_64") {
+ $libdir="${prefix}/usr/lib64";
+ }
+ else {
+ $libdir="${prefix}/usr/lib";
+ }
}
if (!$mandir) {
$mandir="${prefix}/usr/share/man";
@@ -117,10 +112,8 @@
$_ =~ s/\@CC\@/${CC}/;
$_ =~ s/\@INCDIR\@/$incdir/;
$_ =~ s/\@GFS2KINCDIR\@/$gfs2kincdir/;
- $_ =~ s/\@IDDEVINCDIR\@/$iddevincdir/;
$_ =~ s/\@KERNEL_SRC\@/$kernel_src/;
$_ =~ s/\@LIBDIR\@/$libdir/;
- $_ =~ s/\@IDDEVLIBDIR\@/$iddevlibdir/;
$_ =~ s/\@MANDIR\@/$mandir/;
$_ =~ s/\@SBINDIR\@/$sbindir/;
$_ =~ s/\@SHAREDIR\@/$sharedir/;
--- cluster/gfs2/convert/Makefile 2006/06/12 20:40:32 1.4
+++ cluster/gfs2/convert/Makefile 2006/08/11 15:18:12 1.5
@@ -13,22 +13,30 @@
top_srcdir=..
include ${top_srcdir}/make/defines.mk
+TARGET= gfs2_convert
+
INCLUDES=-I${top_srcdir}/include -I${top_srcdir}/config -I${top_srcdir}/libgfs2 -I/usr/include -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
-LIBS=-L${top_srcdir}/libgfs2
+LIBS=${top_srcdir}/libgfs2
CFLAGS+=-D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM -DGFS2_RELEASE_NAME=\"2\" -Wall -g
-all: gfs2_convert
+all: ${TARGET}
-copytobin: gfs2_convert
- cp gfs2_convert ${top_srcdir}/bin
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
gfs2_convert.o: gfs2_convert.c
- $(CC) $(INCLUDES) $(LIBS) $(CFLAGS) -c -o gfs2_convert.o gfs2_convert.c
+ $(CC) $(INCLUDES) $(CFLAGS) -c -o gfs2_convert.o gfs2_convert.c
-gfs2_convert: gfs2_convert.o ../libgfs2/libgfs2.a
- $(CC) $(INCLUDES) $(LIBS) $(CFLAGS) -o gfs2_convert gfs2_convert.o -lgfs2
+gfs2_convert: gfs2_convert.o ${LIBS}/libgfs2.a
+ $(CC) $(INCLUDES) -L$(LIBS) $(CFLAGS) -o ${TARGET} gfs2_convert.o -lgfs2
clean:
- @rm -f *.o gfs2_convert
+ @rm -f *.o ${TARGET}
+
+distclean: clean
+ @rm -f {top_srcdir}/make/defines.mk
--- cluster/gfs2/debug/Makefile 2005/05/19 19:51:12 1.2
+++ cluster/gfs2/debug/Makefile 2006/08/11 15:18:12 1.3
@@ -28,7 +28,7 @@
-DGFS2_RELEASE_NAME=\"${RELEASE}\"
INCLUDE= -I${top_srcdir}/include -I${top_srcdir}/config \
- -I${iddevincdir} -I${gfs2kincdir} -I${incdir}
+ -I${gfs2kincdir} -I${incdir}
ifneq (${KERNEL_SRC}, )
# Use the kernel tree if patched, otherwise, look where cluster headers
@@ -40,16 +40,18 @@
INCLUDE += -I${incdir}
endif
-LDFLAGS+= -L${iddevlibdir} -L${libdir}
-LOADLIBES+= -liddev
+LDFLAGS+= -L${libdir}
all: ${TARGET}
gfs2_debug: ${SOURCE}
- ${CC} ${CFLAGS} ${INCLUDE} ${LDFLAGS} ${SOURCE} ${LOADLIBES} ${LDLIBS} -o $@
+ ${CC} ${CFLAGS} ${INCLUDE} ${LDFLAGS} ${SOURCE} ${LDLIBS} -o $@
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f *.o ${TARGET}
--- cluster/gfs2/edit/Makefile 2006/05/11 16:25:19 1.3
+++ cluster/gfs2/edit/Makefile 2006/08/11 15:18:12 1.4
@@ -24,7 +24,7 @@
-DGFS2_RELEASE_NAME=\"${RELEASE}\"
INCLUDE= -I${top_srcdir}/include -I${top_srcdir}/config -I../libgfs2
-LIBS=-L../libgfs2/
+LIBS=../libgfs2/
ifneq (${KERNEL_SRC}, )
# Use the kernel tree if patched, otherwise, look where cluster headers
@@ -38,11 +38,14 @@
all: gfs2_edit
-gfs2_edit: ${SOURCE} hexedit.h gfs2hex.h
- ${CC} ${CFLAGS} ${INCLUDE} ${LIBS} ${LDFLAGS} ${SOURCE} ${LOADLIBES} ${LDLIBS} -lncurses -o $@ -lgfs2
+gfs2_edit: ${SOURCE} hexedit.h gfs2hex.h ${LIBS}/libgfs2.a
+ ${CC} ${CFLAGS} ${INCLUDE} -L${LIBS} ${LDFLAGS} ${SOURCE} ${LOADLIBES} ${LDLIBS} -lncurses -o $@ -lgfs2
-copytobin: all
- cp ${TARGET} ${top_srcdir}/bin
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f *.o ${TARGET}
--- cluster/gfs2/fsck/Makefile 2006/06/28 14:05:25 1.5
+++ cluster/gfs2/fsck/Makefile 2006/08/11 15:18:13 1.6
@@ -14,8 +14,10 @@
include ${top_srcdir}/make/defines.mk
+TARGET= gfs2_fsck
+
INCLUDES= -I${top_srcdir}/include -I${top_srcdir}/config -I${top_srcdir}/libgfs2 -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
-LIBS=-L${top_srcdir}/libgfs2
+LIBS=${top_srcdir}/libgfs2
.PHONY: all clean
@@ -25,10 +27,10 @@
CFLAGS+=-D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM -DGFS_RELEASE_NAME=\"${RELEASE}\" -Wall -g
-all: gfs2_fsck
+all: ${TARGET}
-gfs2_fsck: $(sources:.c=.o) ../libgfs2/libgfs2.a
- $(CC) $(CFLAGS) $(LIBS) $^ -o $@ -lgfs2
+gfs2_fsck: $(sources:.c=.o) $(LIBS)/libgfs2.a
+ $(CC) $(CFLAGS) -L$(LIBS) $^ -o $@ -lgfs2
%.o: %.c
$(CC) -MMD -c $(INCLUDES) $(CFLAGS) $< -o $@
@@ -42,8 +44,12 @@
clean:
@rm -f gfs2_fsck *.o *~ *.d
-copytobin: gfs2_fsck
- cp gfs2_fsck ${top_srcdir}/bin
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ strip ${TARGET}
+ install -m755 ${TARGET} ${sbindir}
distclean: clean
@rm -f cscope.* gfs2_fsck test_inode_list *.orig *.rej test_block_list test_bitmap
--- cluster/gfs2/init.d/Makefile 2006/06/12 16:26:32 1.2
+++ cluster/gfs2/init.d/Makefile 2006/08/11 15:18:13 1.3
@@ -18,8 +18,6 @@
include ${top_srcdir}/make/defines.mk
-copytobin:
-
clean:
install:
--- cluster/gfs2/libgfs2/Makefile 2006/06/12 20:38:27 1.3
+++ cluster/gfs2/libgfs2/Makefile 2006/08/11 15:18:13 1.4
@@ -39,6 +39,8 @@
.c.o: $<
${CC} ${CFLAGS} -o $@ $^
+install: all
+
clean:
rm -f *.o ${LIBGFS2}
--- cluster/gfs2/mkfs/Makefile 2006/07/10 22:51:10 1.10
+++ cluster/gfs2/mkfs/Makefile 2006/08/11 15:18:13 1.11
@@ -1,7 +1,7 @@
#
# Makefile for GFS2 mkfs
#
-.PHONY: all clean install copytobin
+.PHONY: all clean install
top_srcdir=..
@@ -9,7 +9,6 @@
MKFS=mkfs.gfs2
JADD=gfs2_jadd
-INSTALLPATH=/sbin
INCLUDEPATH=-I${KERNEL_SRC}/include/ -I${top_srcdir}/include/ -I${top_srcdir}/libgfs2/ -I${top_srcdir}/config/
INSTALL=install
@@ -25,7 +24,7 @@
all: ${MKFS} ${JADD}
-${MKFS}: ${O}
+${MKFS}: ${O} ${top_srcdir}/libgfs2/libgfs2.a
${LD} ${LDFLAGS} ${O} -o ${@} -lgfs2 -lvolume_id
${JADD}: ${MKFS}
@@ -34,13 +33,9 @@
.c.o: $<
${CC} ${CFLAGS} -o $@ $^
-copytobin: ${MKFS}
- cp ${MKFS} ${top_srcdir}/bin
- ln -sf ${MKFS} ${top_srcdir}/bin/${JADD}
-
-install: ${MKFS}
- ${INSTALL} -m 0755 -g root -o root ${MKFS} ${INSTALLPATH}
- ln -sf ${MKFS} ${INSTALLPATH}/${JADD}
+install: all
+ ${INSTALL} -m 0755 -g root -o root ${MKFS} ${sbindir}
+ ln -f ${MKFS} ${sbindir}/${JADD}
clean:
rm -f *.o ${MKFS} ${JADD}
--- cluster/gfs2/mount/Makefile 2006/07/24 17:48:50 1.9
+++ cluster/gfs2/mount/Makefile 2006/08/11 15:18:13 1.10
@@ -63,7 +63,7 @@
umount.gfs2: umount.gfs2.o ondisk1.o ondisk2.o util.o mtab.o
${CC} ${LDFLAGS} -o $@ $^
-install: mount.gfs2 umount.gfs2
+install: all
install mount.gfs2 ${sbindir}
install umount.gfs2 ${sbindir}
(cd ${sbindir}; ln -f mount.gfs2 mount.gfs)
--- cluster/gfs2/quota/Makefile 2006/06/09 22:13:19 1.4
+++ cluster/gfs2/quota/Makefile 2006/08/11 15:18:13 1.5
@@ -42,11 +42,11 @@
gfs2_quota: ${SOURCE}
${CC} ${CFLAGS} ${INCLUDE} ${LDFLAGS} ${SOURCE} ${LOADLIBES} ${LDLIBS} -o $@
-copytobin:
-#copytobin: ${TARGET}
-# cp ${TARGET} ${top_srcdir}/bin
+install: all
+# if [ ! -d ${sbindir} ]; then \
+# install -d ${sbindir}; \
+# fi
+# install -m755 ${TARGET} ${sbindir}
clean:
rm -f *.o ${TARGET}
-
-
--- cluster/gfs2/tool/Makefile 2006/06/15 16:40:48 1.4
+++ cluster/gfs2/tool/Makefile 2006/08/11 15:18:13 1.5
@@ -26,9 +26,9 @@
INCLUDE += -I${incdir}
endif
-LIBS=-L${top_srcdir}/libgfs2
+LIBS=${top_srcdir}/libgfs2
-.PHONY: all clean copytobin distclean
+.PHONY: all clean distclean
SOURCES= counters.c df.c layout.c main.c misc.c ondisk.c sb.c tune.c util.c
@@ -40,14 +40,17 @@
all: ${TARGET}
-gfs2_tool: ${OBJECTS} ../libgfs2/libgfs2.a
- $(CC) $(CFLAGS) $(LIBS) $^ -o $@ -lgfs2
+gfs2_tool: ${OBJECTS} $(LIBS)/libgfs2.a
+ $(CC) $(CFLAGS) -L$(LIBS) $^ -o $@ -lgfs2
%.o: %.c
$(CC) -c $(INCLUDE) $(CFLAGS) $< -o $@
-copytobin: ${TARGET}
- cp ${TARGET} ${top_srcdir}/bin
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ install -m755 ${TARGET} ${sbindir}
clean:
@rm -f ${TARGET} *.o *~
--- cluster/gnbd/Makefile 2004/08/16 18:40:40 1.2
+++ cluster/gnbd/Makefile 2006/08/11 15:18:13 1.3
@@ -13,24 +13,26 @@
all:
- cd client && ${MAKE} copytobin
- cd server && ${MAKE} copytobin
- cd tools && ${MAKE} copytobin
+ ${MAKE} -C client all
+ ${MAKE} -C server all
+ ${MAKE} -C tools all
clean:
- cd bin && ${MAKE} clean
- cd client && ${MAKE} clean
- cd server && ${MAKE} clean
- cd tools && ${MAKE} clean
+ ${MAKE} -C client clean
+ ${MAKE} -C server clean
+ ${MAKE} -C tools clean
distclean: clean
rm -f make/defines.mk
-install:
- cd bin && ${MAKE} install
- cd man && ${MAKE} install
+install: all
+ ${MAKE} -C client install
+ ${MAKE} -C server install
+ ${MAKE} -C tools install
+ ${MAKE} -C man install
deinstall uninstall:
- cd bin && ${MAKE} uninstall
- cd man && ${MAKE} uninstall
-
+ ${MAKE} -C client uninstall
+ ${MAKE} -C server uninstall
+ ${MAKE} -C tools uninstall
+ ${MAKE} -C man uninstall
--- cluster/gnbd/client/Makefile 2006/07/20 15:11:16 1.8
+++ cluster/gnbd/client/Makefile 2006/08/11 15:18:14 1.9
@@ -45,8 +45,12 @@
gnbd_monitor: ${MONITOR_SRC}
${CC} ${CFLAGS} ${LDFLAGS} ${MONITOR_SRC} ${LOADLIBES} ${LDLIBS} -o $@
-copytobin: all
- cp ${TARGET} ${top_srcdir}/bin
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ strip ${TARGET}
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f *.o *~ ${TARGET}
--- cluster/gnbd/client/gnbd_monitor.c 2006/05/16 19:08:17 1.12
+++ cluster/gnbd/client/gnbd_monitor.c 2006/08/11 15:18:14 1.13
@@ -26,8 +26,8 @@
#include <inttypes.h>
#include <netdb.h>
#include <netinet/in.h>
-#include <linux/gnbd.h>
+#include "gnbd.h"
#include "group.h"
#include "member_cman.h"
#include "gnbd_endian.h"
--- cluster/gnbd/client/gnbd_recvd.c 2005/03/18 19:39:38 1.5
+++ cluster/gnbd/client/gnbd_recvd.c 2006/08/11 15:18:14 1.6
@@ -22,9 +22,9 @@
#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <linux/gnbd.h>
#include <inttypes.h>
+#include "gnbd.h"
#include "gnbd_endian.h"
#include "gnbd_utils.h"
#include "gserv.h"
--- cluster/gnbd/man/Makefile 2006/06/02 00:45:04 1.2
+++ cluster/gnbd/man/Makefile 2006/08/11 15:18:14 1.3
@@ -26,8 +26,6 @@
all:
-copytobin:
-
clean:
install: all
--- cluster/gnbd/server/Makefile 2006/07/20 15:11:17 1.8
+++ cluster/gnbd/server/Makefile 2006/08/11 15:18:14 1.9
@@ -46,8 +46,12 @@
gnbd_serv: ${SRV_SOURCE}
${CC} ${CFLAGS} ${LDFLAGS} ${SRV_SOURCE} ${LOADLIBES} ${LDLIBS} -o $@
-copytobin: all
- cp ${TARGET} ${top_srcdir}/bin
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ strip ${TARGET}
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f *.o ${TARGET}
--- cluster/gnbd/server/device.c 2006/03/14 23:10:40 1.7
+++ cluster/gnbd/server/device.c 2006/08/11 15:18:14 1.8
@@ -21,7 +21,7 @@
#include <inttypes.h>
#include <sys/mount.h>
-#include <linux/gnbd.h>
+#include "gnbd.h"
#ifndef BLKGETSIZE64
#define BLKGETSIZE64 _IOR(0x12, 114, uint64_t)
--- cluster/gnbd/server/gserv.c 2004/08/14 01:33:21 1.4
+++ cluster/gnbd/server/gserv.c 2006/08/11 15:18:14 1.5
@@ -21,8 +21,8 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <fcntl.h>
-#include <linux/gnbd.h>
+#include "gnbd.h"
#include "gnbd_endian.h"
#include "list.h"
#include "gnbd_utils.h"
--- cluster/gnbd/tools/Makefile 2004/06/24 08:53:33 1.1
+++ cluster/gnbd/tools/Makefile 2006/08/11 15:18:14 1.2
@@ -13,16 +13,16 @@
all:
- cd fence_gnbd && ${MAKE} all
- cd gnbd_export && ${MAKE} all
- cd gnbd_import && ${MAKE} all
+ ${MAKE} -C fence_gnbd all
+ ${MAKE} -C gnbd_export all
+ ${MAKE} -C gnbd_import all
-copytobin:
- cd fence_gnbd && ${MAKE} copytobin
- cd gnbd_export && ${MAKE} copytobin
- cd gnbd_import && ${MAKE} copytobin
+install: all
+ ${MAKE} -C fence_gnbd install
+ ${MAKE} -C gnbd_export install
+ ${MAKE} -C gnbd_import install
clean:
- cd fence_gnbd && ${MAKE} clean
- cd gnbd_export && ${MAKE} clean
- cd gnbd_import && ${MAKE} clean
+ ${MAKE} -C fence_gnbd clean
+ ${MAKE} -C gnbd_export clean
+ ${MAKE} -C gnbd_import clean
--- cluster/gnbd/tools/fence_gnbd/Makefile 2004/06/24 08:53:34 1.1
+++ cluster/gnbd/tools/fence_gnbd/Makefile 2006/08/11 15:18:14 1.2
@@ -29,8 +29,12 @@
fence_gnbd: ${SOURCE:.c=.o}
${CC} ${CFLAGS} ${LDFLAGS} ${SOURCE:.c=.o} ${LOADLIBES} ${LDLIBS} -o $@
-copytobin: all
- cp ${TARGET} ${top_srcdir}/bin
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ strip ${TARGET}
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f *.o ${TARGET}
--- cluster/gnbd/tools/gnbd_export/Makefile 2006/07/20 15:11:19 1.10
+++ cluster/gnbd/tools/gnbd_export/Makefile 2006/08/11 15:18:14 1.11
@@ -33,9 +33,13 @@
gnbd_export: ${SOURCE}
${CC} ${CFLAGS} ${LDFLAGS} ${SOURCE} ${LOADLIBES} ${LDLIBS} -o $@
-copytobin: all gnbd_get_uid
- cp ${TARGET} ${top_srcdir}/bin
- cp gnbd_get_uid ${top_srcdir}/bin
+install: all gnbd_get_uid
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ strip ${TARGET}
+ install -m755 ${TARGET} ${sbindir}
+ install -m755 gnbd_get_uid ${sbindir}
clean:
rm -f *.o ${TARGET}
--- cluster/gnbd/tools/gnbd_import/Makefile 2006/07/20 15:11:19 1.7
+++ cluster/gnbd/tools/gnbd_import/Makefile 2006/08/11 15:18:14 1.8
@@ -42,8 +42,12 @@
gnbd_import: ${SOURCE}
${CC} ${CFLAGS} ${LDFLAGS} ${SOURCE} ${LOADLIBES} ${LDLIBS} -o $@
-copytobin: all
- cp ${TARGET} ${top_srcdir}/bin
+install: all
+ if [ ! -d ${sbindir} ]; then \
+ install -d ${sbindir}; \
+ fi
+ strip ${TARGET}
+ install -m755 ${TARGET} ${sbindir}
clean:
rm -f *.o ${TARGET}
--- cluster/gnbd/tools/gnbd_import/gnbd_import.c 2006/06/26 17:29:31 1.17
+++ cluster/gnbd/tools/gnbd_import/gnbd_import.c 2006/08/11 15:18:14 1.18
@@ -26,9 +26,9 @@
#include <netdb.h>
#include <arpa/inet.h>
#include <sys/utsname.h>
-#include <linux/gnbd.h>
#include <inttypes.h>
+#include "gnbd.h"
#include "fence_return.h"
#include "gnbd_endian.h"
#include "gnbd_utils.h"
--- cluster/gnbd-kernel/Makefile 2004/06/24 18:34:59 1.1
+++ cluster/gnbd-kernel/Makefile 2006/08/11 15:18:14 1.2
@@ -1,14 +1,14 @@
all:
- cd src && ${MAKE} all
+ ${MAKE} -C src all
clean:
- cd src && ${MAKE} clean
+ ${MAKE} -C src clean
-install:
- cd src && ${MAKE} install
+install: all
+ ${MAKE} -C src install
uninstall:
- cd src && ${MAKE} uninstall
+ ${MAKE} -C src uninstall
distclean: clean
- rm -f make/defines.mk
\ No newline at end of file
+ rm -f make/defines.mk
--- cluster/gnbd-kernel/src/Makefile 2004/11/17 22:38:56 1.4
+++ cluster/gnbd-kernel/src/Makefile 2006/08/11 15:18:14 1.5
@@ -24,17 +24,15 @@
PATCH_TARGET = gnbd.patch
PWD := $(shell pwd)
-
+
obj-m := gnbd.o
lock_gnbd-objs := gnbd.c
EXTRA_CFLAGS += -I$(obj)
all:
- rm -f linux
- ln -s . linux
${MAKE} -C ${KERNEL_SRC} M=${PWD} modules USING_KBUILD=yes
-
+
install: all
install -d ${incdir}/linux
install gnbd.h ${incdir}/linux
--- cluster/gnbd-kernel/src/gnbd.c 2006/08/08 21:04:32 1.14
+++ cluster/gnbd-kernel/src/gnbd.c 2006/08/11 15:18:14 1.15
@@ -34,7 +34,7 @@
#include <asm/uaccess.h>
#include <asm/types.h>
-#include <linux/gnbd.h>
+#include "gnbd.h"
static int major_nr = 0;
uint64_t insmod_time;
--- cluster/group/Makefile 2006/07/19 14:46:52 1.6
+++ cluster/group/Makefile 2006/08/11 15:18:14 1.7
@@ -11,26 +11,25 @@
###############################################################################
all:
- cd lib && ${MAKE} all
- cd daemon && ${MAKE} all
- cd tool && ${MAKE} all
- cd dlm_controld && ${MAKE} all
- cd gfs_controld && ${MAKE} all
+ ${MAKE} -C lib all
+ ${MAKE} -C daemon all
+ ${MAKE} -C tool all
+ ${MAKE} -C dlm_controld all
+ ${MAKE} -C gfs_controld all
clean:
- cd lib && ${MAKE} clean
- cd daemon && ${MAKE} clean
- cd tool && ${MAKE} clean
- cd dlm_controld && ${MAKE} clean
- cd gfs_controld && ${MAKE} clean
+ ${MAKE} -C lib clean
+ ${MAKE} -C daemon clean
+ ${MAKE} -C tool clean
+ ${MAKE} -C dlm_controld clean
+ ${MAKE} -C gfs_controld clean
-install:
- cd lib && ${MAKE} install
- cd daemon && ${MAKE} install
- cd tool && ${MAKE} install
- cd dlm_controld && ${MAKE} install
- cd gfs_controld && ${MAKE} install
+install: all
+ ${MAKE} -C lib install
+ ${MAKE} -C daemon install
+ ${MAKE} -C tool install
+ ${MAKE} -C dlm_controld install
+ ${MAKE} -C gfs_controld install
distclean: clean
rm -f make/defines.mk
-
--- cluster/group/configure 2006/07/07 16:14:33 1.2
+++ cluster/group/configure 2006/08/11 15:18:14 1.3
@@ -14,6 +14,7 @@
###############################################################################
use Getopt::Long;
+use POSIX;
print "\nConfiguring Makefiles for your system...\n";
@@ -26,10 +27,8 @@
help => \$help,
incdir => \$incdir,
gfskincdir => \$gfskincdir,
- iddevincdir => \$iddevincdir,
kernel_src => \$kernel_src,
libdir => \$libdir,
- iddevlibdir => \$iddevlibdir,
cmanlibdir => \$cmanlibdir,
mandir => \$mandir,
prefix => \$prefix,
@@ -41,10 +40,8 @@
'help',
'incdir=s',
'gfskincdir=s',
- 'iddevincdir=s',
'kernel_src=s',
'libdir=s',
- 'iddevlibdir=s',
'cmanlibdir=s',
'mandir=s',
'prefix=s',
@@ -66,10 +63,8 @@
print "install flags:\n";
print "--incdir=\tthe base directory for include files. (Default: /usr/include)\n";
print "--gfskincdir=\tthe base directory for GFS kernel include files. (Default: {incdir}/cluster)\n";
- print "--iddevincdir=\tthe base directory for iddev include files. (Default: {incdir}/cluster)\n";
print "--kernel_src=\tthe directory containing the kernel source you wish to\n\t\tcompile against. (Default: system dependant)\n";
print "--libdir=\tthe base directory for libraries. (Default: /usr/lib)\n";
- print "--iddevlibdir=\tthe base directory for libraries. (Default: {libdir})\n";
print "--cmanlibdir=\tthe base directory for cman libraries. (Default: {libdir})\n";
print "--mandir=\tthe base directory for man pages. (Default: /usr/share/man)\n";
print "--prefix=\tthe base directory to install into. (Default: /)\n";
@@ -90,14 +85,14 @@
if (!$gfskincdir) {
$gfskincdir="${incdir}/cluster";
}
-if (!$iddevincdir) {
- $iddevincdir="${incdir}/cluster";
-}
if (!$libdir) {
- $libdir="${prefix}/usr/lib";
-}
-if (!$iddevlibdir) {
- $iddevlibdir="${libdir}";
+ my $arch = (POSIX::uname())[4];
+ if ($arch eq "x86_64") {
+ $libdir="${prefix}/usr/lib64";
+ }
+ else {
+ $libdir="${prefix}/usr/lib";
+ }
}
if (!$cmanlibdir) {
$cmanlibdir="${libdir}";
@@ -123,10 +118,8 @@
$_ =~ s/\@CC\@/${CC}/;
$_ =~ s/\@INCDIR\@/$incdir/;
$_ =~ s/\@GFSKINCDIR\@/$gfskincdir/;
- $_ =~ s/\@IDDEVINCDIR\@/$iddevincdir/;
$_ =~ s/\@KERNEL_SRC\@/$kernel_src/;
$_ =~ s/\@LIBDIR\@/$libdir/;
- $_ =~ s/\@IDDEVLIBDIR\@/$iddevlibdir/;
$_ =~ s/\@CMANLIBDIR\@/$cmanlibdir/;
$_ =~ s/\@MANDIR\@/$mandir/;
$_ =~ s/\@SBINDIR\@/$sbindir/;
--- cluster/group/daemon/Makefile 2006/07/07 16:53:25 1.15
+++ cluster/group/daemon/Makefile 2006/08/11 15:18:15 1.16
@@ -46,7 +46,7 @@
clean:
rm -f *.o groupd
-install: groupd
+install: all
install -d ${sbindir}
install groupd ${sbindir}
--- cluster/group/dlm_controld/Makefile 2006/07/07 16:14:34 1.3
+++ cluster/group/dlm_controld/Makefile 2006/08/11 15:18:15 1.4
@@ -30,9 +30,6 @@
all: ${TARGET}
-copytobin: all
- cp ${TARGET} ${top_srcdir}/bin
-
dlm_controld: main.o \
member_cman.o \
group.o \
@@ -53,13 +50,13 @@
action.o: action.c
$(CC) $(CFLAGS) -c -o $@ $<
-install: dlm_controld
+install: all
install -d ${sbindir}
- install dlm_controld ${sbindir}
+ install ${TARGET} ${sbindir}
uninstall:
- ${UNINSTALL} dlm_controld ${sbindir}
+ ${UNINSTALL} ${TARGET} ${sbindir}
clean:
- rm -f *.o dlm_controld
+ rm -f *.o ${TARGET}
--- cluster/group/gfs_controld/Makefile 2006/07/31 18:37:07 1.6
+++ cluster/group/gfs_controld/Makefile 2006/08/11 15:18:15 1.7
@@ -28,9 +28,6 @@
all: ${TARGET}
-copytobin: all
- cp ${TARGET} ${top_srcdir}/bin
-
gfs_controld: main.o \
member_cman.o \
cpg.o \
@@ -62,13 +59,12 @@
plock.o: plock.c
$(CC) $(CFLAGS) -c -o $@ $<
-install: gfs_controld
+install: all
install -d ${sbindir}
- install gfs_controld ${sbindir}
+ install ${TARGET} ${sbindir}
uninstall:
- ${UNINSTALL} gfs_controld ${sbindir}
+ ${UNINSTALL} ${TARGET} ${sbindir}
clean:
- rm -f *.o gfs_controld
-
+ rm -f *.o ${TARGET}
--- cluster/group/lib/Makefile 2005/06/23 15:32:30 1.2
+++ cluster/group/lib/Makefile 2006/08/11 15:18:15 1.3
@@ -31,8 +31,6 @@
libgroup.o: libgroup.c
$(CC) $(CFLAGS) -c -o $@ $< -I../daemon
-copytobin: all
-
install: all
uninstall:
--- cluster/group/make/defines.mk.input 2006/08/04 16:54:01 1.4
+++ cluster/group/make/defines.mk.input 2006/08/11 15:18:15 1.5
@@ -15,11 +15,9 @@
sbindir ?= ${DESTDIR}/@SBINDIR@
mandir ?= ${DESTDIR}/@MANDIR@
libdir ?= ${DESTDIR}/@LIBDIR@
-iddevlibdir ?= ${DESTDIR}/@IDDEVLIBDIR@
cmanlibdir ?= ${DESTDIR}/@CMANLIBDIR@
incdir ?= ${DESTDIR}/@INCDIR@
gfskincdir ?= ${DESTDIR}/@GFSKINCDIR@
-iddevincdir ?= ${DESTDIR}/@IDDEVINCDIR@
# Where's the kernel?
KERNEL_SRC = @KERNEL_SRC@
--- cluster/group/tool/Makefile 2006/06/28 19:57:05 1.5
+++ cluster/group/tool/Makefile 2006/08/11 15:18:15 1.6
@@ -29,7 +29,7 @@
clean:
rm -f *.o group_tool
-install: group_tool
+install: all
install -d ${sbindir}
install group_tool ${sbindir}
--- cluster/rgmanager/Makefile 2005/03/21 22:51:17 1.3
+++ cluster/rgmanager/Makefile 2006/08/11 15:18:16 1.4
@@ -12,21 +12,21 @@
###############################################################################
all:
- cd src && ${MAKE} all
+ ${MAKE} -C src all
clean:
- cd src && ${MAKE} clean
+ ${MAKE} -C src clean
distclean: clean
rm -f make/defines.mk
-install:
- cd src && ${MAKE} install
- cd man && ${MAKE} install
- cd init.d && ${MAKE} install
+install: all
+ ${MAKE} -C src install
+ ${MAKE} -C man install
+ ${MAKE} -C init.d install
check:
- cd src && ${MAKE} check
+ ${MAKE} -C src check
uninstall:
- cd src && ${MAKE} uninstall
+ ${MAKE} -C src uninstall
--- cluster/rgmanager/src/Makefile 2005/01/25 17:31:12 1.2
+++ cluster/rgmanager/src/Makefile 2006/08/11 15:18:16 1.3
@@ -12,32 +12,32 @@
###############################################################################
all:
- cd resources && ${MAKE} all
- cd clulib && ${MAKE} all
- cd daemons && ${MAKE} all
- cd utils && ${MAKE} all
+ ${MAKE} -C resources all
+ ${MAKE} -C clulib all
+ ${MAKE} -C daemons all
+ ${MAKE} -C utils all
clean:
- cd resources && ${MAKE} clean
- cd clulib && ${MAKE} clean
- cd daemons && ${MAKE} clean
- cd utils && ${MAKE} clean
+ ${MAKE} -C resources clean
+ ${MAKE} -C clulib clean
+ ${MAKE} -C daemons clean
+ ${MAKE} -C utils clean
check:
- cd resources && ${MAKE} check
- cd daemons && ${MAKE} check
+ ${MAKE} -C resources check
+ ${MAKE} -C daemons check
distclean: clean
rm -f make/defines.mk
-install:
- cd resources && ${MAKE} install
- cd clulib && ${MAKE} install
- cd daemons && ${MAKE} install
- cd utils && ${MAKE} install
+install: all
+ ${MAKE} -C resources install
+ ${MAKE} -C clulib install
+ ${MAKE} -C daemons install
+ ${MAKE} -C utils install
uninstall:
- cd resources && ${MAKE} uninstall
- cd clulib && ${MAKE} uninstall
- cd daemons && ${MAKE} uninstall
- cd utils && ${MAKE} uninstall
+ ${MAKE} -C resources uninstall
+ ${MAKE} -C clulib uninstall
+ ${MAKE} -C daemons uninstall
+ ${MAKE} -C utils uninstall
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2006-08-11 15:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-08-11 15:18 [Cluster-devel] cluster ./Makefile ccs/Makefile ccs/ccs_test/M rpeterso
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.