OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-235-gf22ae5f
Gerrit Code Review
gerrit@openafs.org
Mon, 11 Oct 2010 08:01:03 -0700 (PDT)
The following commit has been merged in the master branch:
commit f22ae5f7d8b3c143de21355f819ab872a0cf76fd
Author: Simon Wilkinson <sxw@your-file-system.com>
Date: Mon Oct 4 13:49:16 2010 +0100
Unix: Rework build system
Rework the unix build system so that we support taking CFLAGS and
LDFLAGS from the command line, and don't replace them with our own
settings. Also, take the opportunity to bring some sanity and
consistency into our Makefiles.
The standard Makefile.config now defines rules for LWP, pthreaded
and shared library builds. The CFLAGS settings for these are
called LWP_CFLAGS, PTH_CFLAGS and SHD_CFLAGS, respectively.
Similarly named variables are provided for LDFLAGS.
A module may select to use a particular build type for its suffix
rule by including either Makefile.lwp, Makefile.pthread or
Makefile.shared from src/config. This creates an appropriate .c.o
suffix rule, defines AFS_CFLAGS and AFS_LDFLAGS as appropriate, and
creates two rules AFS_CCRULE and AFS_LDRULE, which can be used to
build, and link objects. For example:
foo.o: foo.c
$(AFS_CCRULE) foo.c
foo: foo.o
$(AFS_LDRULE) foo.o
If a you wish to override the CFLAGS or LDFLAGS for an object build
using these rules (or through the .c.o suffix rule) you can do so,
by defining CFLAGS_<object> or LDFLAGS_<object>. For example:
CFLAGS_foo.o= -DDEBUG
LDFLAGS_foo = -ldebugging
A module may also alter the behaviour of the compile and link steps
module wide by defining MODULE_CFLAGS or MODULE_LDFLAGS.
This functionality is now used throughout the tree:
*) Suffix rules are used wherever possible, removing a number of
unecessary build rules.
*) All link steps are replaced with AFS_LDRULE
*) All standard compile steps are replaced with AFS_CCRULE
*) Unusal compile steps are defined, as far as possible, int
terms of the LWP_ PTH_ and SHD_ variables.
*) The use of $? has been removed entirely, as it makes it
impossible to provide build rules with dependency information
Change-Id: If76207e45da402a0ed9d7c1bdbe83c58c911a4f2
Reviewed-on: http://gerrit.openafs.org/2896
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Makefile.in | 3 +
configure.ac | 3 +
src/afs/Makefile.in | 2 +
src/afsd/Makefile.in | 26 ++--
src/afsmonitor/Makefile.in | 9 +-
src/afsweb/Makefile.in | 10 +-
src/aklog/Makefile.in | 8 +-
src/audit/Makefile.in | 9 +-
src/auth/Makefile.in | 12 +-
src/auth/test/Makefile.in | 6 +-
src/bozo/Makefile.in | 12 +-
src/bozo/test/Makefile.in | 9 +-
src/bu_utils/Makefile.in | 4 +-
src/bubasics/Makefile.in | 2 +
src/bucoord/Makefile.in | 21 +--
src/budb/Makefile.in | 4 +-
src/butc/Makefile.in | 23 ++--
src/butm/Makefile.in | 4 +-
src/cf/osconf.m4 | 1 -
src/cmd/Makefile.in | 12 ++-
src/cmd/test/Makefile.in | 13 +-
src/comerr/Makefile.in | 9 +-
src/comerr/test/Makefile.in | 7 +-
src/config/.gitignore | 3 +
src/config/Makefile.config.in | 30 +++-
src/config/Makefile.in | 17 +--
src/config/Makefile.lwp.in | 7 +
src/config/Makefile.pthread.in | 8 +
src/config/Makefile.shared.in | 10 ++
src/crypto/hcrypto/Makefile.in | 140 +++++++++----------
src/des/Makefile.in | 22 ++--
src/des/test/Makefile.in | 12 +-
src/dir/Makefile.in | 2 +
src/dir/test/Makefile.in | 6 +-
src/dviced/Makefile.in | 148 ++++++++++----------
src/dvolser/Makefile.in | 177 +++++++++++-------------
src/export/Makefile.in | 57 ++++++---
src/finale/Makefile.in | 4 +-
src/fsint/Makefile.in | 4 +-
src/fsprobe/Makefile.in | 5 +-
src/gtx/Makefile.in | 13 +-
src/kauth/Makefile.in | 47 +++----
src/kauth/test/Makefile.in | 20 ++--
src/kopenafs/Makefile.in | 19 ++--
src/libacl/Makefile.in | 2 +
src/libacl/test/Makefile.in | 7 +-
src/libadmin/Makefile.in | 2 +
src/libadmin/adminutil/Makefile.in | 25 ++--
src/libadmin/bos/Makefile.in | 11 +-
src/libadmin/cfg/Makefile.in | 9 +-
src/libadmin/cfg/test/Makefile.in | 8 +-
src/libadmin/client/Makefile.in | 5 +-
src/libadmin/kas/Makefile.in | 14 +-
src/libadmin/pts/Makefile.in | 10 +-
src/libadmin/samples/Makefile.in | 53 ++++----
src/libadmin/test/Makefile.in | 11 +-
src/libadmin/vos/Makefile.in | 18 +--
src/libafsauthent/Makefile.in | 157 +++++++++++-----------
src/libafsrpc/Makefile.in | 167 ++++++++++++-----------
src/log/Makefile.in | 10 +-
src/log/test/Makefile.in | 11 +-
src/lwp/Makefile.in | 21 ++--
src/lwp/test/Makefile.in | 17 +--
src/pam/Makefile.in | 34 +++--
src/platform/DARWIN/Makefile.in | 4 +-
src/platform/DARWIN/growlagent/Makefile.in | 4 +-
src/platform/SOLARIS/Makefile.in | 5 +-
src/procmgmt/Makefile.in | 3 +-
src/procmgmt/test/Makefile.in | 4 +-
src/ptserver/Makefile.in | 33 +++--
src/rx/Makefile.in | 4 +-
src/rx/bulk.example/Makefile.in | 9 +-
src/rx/bulktest/Makefile.in | 9 +-
src/rx/multi.example/Makefile.in | 6 +-
src/rx/simple.example/Makefile.in | 10 +-
src/rx/test/Makefile.in | 42 +++---
src/rxdebug/Makefile.in | 12 +-
src/rxgen/Makefile.in | 7 +-
src/rxkad/Makefile.in | 9 +-
src/rxkad/test/Makefile.in | 15 ++-
src/rxstat/Makefile.in | 2 +
src/scout/Makefile.in | 4 +-
src/sgistuff/Makefile.in | 12 +-
src/shlibafsauthent/Makefile.in | 179 +++++++++++-------------
src/shlibafsrpc/Makefile.in | 203 ++++++++++++++--------------
src/sys/Makefile.in | 47 +++----
src/tbudb/Makefile.in | 64 +++++-----
src/tbutc/Makefile.in | 43 +++---
src/tests/Makefile.in | 139 +++++++++----------
src/tptserver/Makefile.in | 100 +++++++-------
src/tsalvaged/Makefile.in | 118 ++++++++---------
src/tsm41/Makefile.in | 18 +--
src/tubik/Makefile.in | 176 +++++++++++-------------
src/tviced/Makefile.in | 145 ++++++++++----------
src/tvlserver/Makefile.in | 77 +++++------
src/tvolser/Makefile.in | 182 ++++++++++++-------------
src/ubik/Makefile.in | 12 +-
src/update/Makefile.in | 6 +-
src/usd/Makefile.in | 6 +-
src/usd/test/Makefile.in | 4 +-
src/uss/Makefile.in | 32 +----
src/util/Makefile.in | 86 +-----------
src/util/test/Makefile.in | 14 +-
src/venus/Makefile.in | 41 +++---
src/venus/test/Makefile.in | 12 +-
src/vfsck/Makefile.in | 6 +-
src/viced/Makefile.in | 28 ++--
src/vlserver/Makefile.in | 13 +-
src/vol/Makefile.in | 37 +++---
src/vol/test/Makefile.in | 31 ++---
src/volser/Makefile.in | 15 +-
src/xstat/Makefile.in | 6 +-
tests/Makefile.in | 8 +-
tests/rpctestlib/Makefile.in | 39 ++----
tests/tap/Makefile.in | 3 +-
tests/util/Makefile.in | 9 +-
116 files changed, 1774 insertions(+), 1871 deletions(-)
--
OpenAFS Master Repository