Switch from a rake-based build to a make-based build.

Browse Source

This commit beefs up the Makefile to do the build, instead of the
Rakefile.

It also removes from the Rakefile the dependency on rake_utils, which
should mean it's ok to build in a schroot.

The files are reorganised to make the Makefile rules more tractable,
although the reorganisation reveals a problem with our current code
organisation.

The problem is that the proxy-specific code transitively depends on the
server code via flexnbd.h, which has a circular dependency on the server
and client structs. This should be broken in a future commit by
separating the flexnbd struct into a shared config struct and
server-specific parts, so that the server code can be moved into
src/server to more accurately show the functional dependencies.

...

This commit is contained in:

Alex Young

2014-02-21 19:10:55 +00:00

parent 0baf93fd7b

commit 4f31bd9340

44 changed files with 143 additions and 303 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

src/acl.c → src/common/acl.c

0

src/acl.h → src/common/acl.h

0

src/client.c → src/common/client.c

0

src/client.h → src/common/client.h

0

src/control.c → src/common/control.c

0

src/control.h → src/common/control.h

0

src/flexnbd.c → src/common/flexnbd.c

0

src/flexnbd.h → src/common/flexnbd.h

0

src/flexthread.c → src/common/flexthread.c

0

src/flexthread.h → src/common/flexthread.h

0

src/ioutil.c → src/common/ioutil.c

0

src/ioutil.h → src/common/ioutil.h

0

src/mbox.c → src/common/mbox.c

0

src/mbox.h → src/common/mbox.h

0

src/mirror.c → src/common/mirror.c

0

src/mirror.h → src/common/mirror.h

0

src/mode.c → src/common/mode.c

0

src/mode.h → src/common/mode.h

0

src/nbdtypes.c → src/common/nbdtypes.c

0

src/nbdtypes.h → src/common/nbdtypes.h

0

src/parse.c → src/common/parse.c

0

src/parse.h → src/common/parse.h

0

src/readwrite.c → src/common/readwrite.c

0

src/readwrite.h → src/common/readwrite.h

0

src/remote.c → src/common/remote.c

0

src/self_pipe.c → src/common/self_pipe.c

0

src/self_pipe.h → src/common/self_pipe.h

0

src/serve.c → src/common/serve.c

0

src/serve.h → src/common/serve.h

0

src/sockutil.c → src/common/sockutil.c

0

src/sockutil.h → src/common/sockutil.h

0

src/status.c → src/common/status.c

0

src/status.h → src/common/status.h

0

src/util.c → src/common/util.c

0

src/util.h → src/common/util.h

0

src/prefetch.h → src/proxy/prefetch.h

0

src/proxy.c → src/proxy/proxy.c

0

src/proxy.h → src/proxy/proxy.h

0

src/bitset.h → src/server/bitset.h