Clean up library dependencies
authorMarkus Armbruster <armbru@pond.sub.org>
Sat, 2 Feb 2008 20:03:12 +0000 (21:03 +0100)
committerMarkus Armbruster <armbru@pond.sub.org>
Sun, 3 Feb 2008 07:11:13 +0000 (08:11 +0100)
commit77e95bd7882e96502e2dc76424228cf83b48b722
treee93f88075aecb4b7b0317846ce0eac52dff12c56
parent1cbb37d4fb45d5cf4f9c36b3384744b04b4634cb
Clean up library dependencies

Move stuff to untangle the ugly cyclic dependencies between the
archives built for selected subdirectories of src/lib/:

* Move common/io.c to empthread/ because it requires empthread stuff

* Move parts of subs/nstr.c to common/nstreval.c to satisfy
  common/ef_verify.o

* Move getstarg.c getstring.c onearg.c from gen/ to subs/ because they
  require stuff from there

* Move bridgefall.c check.c damage.c empobj.c journal.c maps.c
  sectdamage.c from common/ to subs/ because they require stuff from
  there

* Move cnumb.c from subs/ to common/ to satisfy common/type.o

* Move log.c fsize.c from common/ to gen/ because they really belong
  there

* Move emp_config.c mapdist.c from gen/ to common/ because they really
  belong there, and require stuff from libglobal.a

Also package as/ as libas.a to satisfy common/path.o.

Remaining dependencies:

    lib             needs
    --------------------------------------------
    libas.a         libglobal.a
    libcommon.a     libas.a libglobal.a libgen.a
    libgen.a
    libglobal.a
    liblwp.a        libgen.a
    libw32.a[*]     libgen.a

    [*] Except for service.o, which can only be linked into the server

Link order now: liblwp.a libcommon.a libas.a libgen.a libglobal.a
libw32.a.  The position of libw32.a is not quite right, but works
anyway.
36 files changed:
Make.mk
include/prototypes.h
src/lib/common/bridgefall.c [deleted file]
src/lib/common/check.c [deleted file]
src/lib/common/cnumb.c [new file with mode: 0644]
src/lib/common/damage.c [deleted file]
src/lib/common/emp_config.c [new file with mode: 0644]
src/lib/common/empobj.c [deleted file]
src/lib/common/fsize.c [deleted file]
src/lib/common/journal.c [deleted file]
src/lib/common/log.c [deleted file]
src/lib/common/mapdist.c [new file with mode: 0644]
src/lib/common/maps.c [deleted file]
src/lib/common/nstreval.c [new file with mode: 0644]
src/lib/common/sectdamage.c [deleted file]
src/lib/empthread/io.c [new file with mode: 0644]
src/lib/gen/emp_config.c [deleted file]
src/lib/gen/fsize.c [new file with mode: 0644]
src/lib/gen/getstarg.c [deleted file]
src/lib/gen/getstring.c [deleted file]
src/lib/gen/io.c [deleted file]
src/lib/gen/log.c [new file with mode: 0644]
src/lib/gen/mapdist.c [deleted file]
src/lib/gen/onearg.c [deleted file]
src/lib/subs/bridgefall.c [new file with mode: 0644]
src/lib/subs/check.c [new file with mode: 0644]
src/lib/subs/cnumb.c [deleted file]
src/lib/subs/damage.c [new file with mode: 0644]
src/lib/subs/empobj.c [new file with mode: 0644]
src/lib/subs/getstarg.c [new file with mode: 0644]
src/lib/subs/getstring.c [new file with mode: 0644]
src/lib/subs/journal.c [new file with mode: 0644]
src/lib/subs/maps.c [new file with mode: 0644]
src/lib/subs/nstr.c
src/lib/subs/onearg.c [new file with mode: 0644]
src/lib/subs/sectdamage.c [new file with mode: 0644]