diff options
author | Thomas Schwinge <tschwinge@gnu.org> | 2006-01-31 09:21:05 +0000 |
---|---|---|
committer | Thomas Schwinge <tschwinge@gnu.org> | 2009-06-18 00:26:31 +0200 |
commit | 70b84c83f21a5943a291e86520e02f676517e644 (patch) | |
tree | 3532ba64b621bd7cc568a4d7853d57abe7c397ee /vm | |
parent | 3a52c9edfa90e81f19b208e0c289072dcb2f24c8 (diff) |
2006-01-31 Thomas Schwinge <tschwinge@gnu.org>
Cleanup of GNU Mach's build system. The system dependend parts are now
handeled by the respective Makefile and no longer by the top-level one.
* configure, i386/configure, i386/linux/configure, linux/configure:
Regenerated.
* Makefile.in: Various cleanups.
(mach/machine, mach_machine): Targets removed.
(AWK, CC, CFLAGS, CPPFLAGS, DEFINES, INCLUDES, INSTALL, INSTALL_DATA)
(INSTALL_PROGRAM, LD, MIG, MIGFLAGS, NM): Variables moved into
Makerules.in.
Do not include $(sysdep)/Makefrag anymore.
(all, check, clean, distclean, mostlyclean, maintainer-clean, install)
(install-headers, install-kernel): Recurse into the system dependend
subdirectory.
(check): Add a basic test using mbchk.
(clean, distclean): Be more explicit in what to delete.
($(systype)/%): New target.
(kernel.o): Incorporate the system dependend archive.
(installed-sysdep-headers-names, $(installed-sysdep-headers-names)):
Variable and target moved into the system dependend Makefile.in.
(install-headers, mkheaderdirs): Don't care for the system dependend
header files.
(%.symc, %.symc.o, %.h, %_user.c, %_interface.h, %_server.c): Targets
moved into Makerules.in.
Inclusion of dependency files: Likewise.
(%.migs_d, %.migu_d, %.migsh_d, %.miguh_d, make-deps, %.d): Likewise.
Include Makerules.
* Makerules.in: New file, mainly based on Makefile.in.
* configure.in: Do not substitute cross_compiling and not explicitly
substitute LDFLAGS.
Check for cpp, ranlib, ar and mbchk.
Care for the mach/machine symbolic link.
Add Makerules as a config file.
* i386/Makefile.in: Various cleanups.
Merge i386/Makefrag and the system dependent stuff from Makefile.in
into this file.
(all, check, install, install-headers, install-kernel): Recurse into
the system dependend subdirectory.
(sysdep.o): transformed to the new target sysdep.a.
(linux/linux.o): Target removed.
(clean, distclean): Be more explicit in what to delete.
(linux/%): New target.
(install-headers): Install the system dependend header files.
(mkheaderdirs): New target.
Include the top-level Makerules.
* i386/Makefrag: File removed.
* i386/Makerules.in: New file.
* i386/configure.in: Synchronize AC_INIT to the top-level definition.
Do not check for ld and make.
Add Makerules as a config file.
* i386/linux/Makefile.in: Various cleanups.
Replace linux-objs with objfiles.
(check, install, install-headers, install-kernel): New empty targets.
Don't care about linux-flags if no_deps is true.
Inclusion of dependency files removed and instead...
Include the top-level Makerules.
* i386/linux/Makerules.in: New file.
* i386/linux/configure.ac: Synchronize AC_INIT to the top-level
definition.
Do not check for gcc and ld.
Do not explicitly substitute LDFLAGS.
Add Makerules as a config file.
* linux/configure.in: Synchronize AC_INIT to the top-level definition.
Do not create directories using a dummy file.
* linux/dummy.in: File removed.
* ddb/db_access.h: Include <machine/vm_param.h> instead of
"vm_param.h".
* kern/bootstrap.c: Likewise.
* kern/thread.c: Likewise.
* vm/vm_kern.c: Likewise.
* vm/vm_object.c: Likewise.
* vm/vm_resident.c: Likewise.
Diffstat (limited to 'vm')
-rw-r--r-- | vm/vm_kern.c | 2 | ||||
-rw-r--r-- | vm/vm_object.c | 2 | ||||
-rw-r--r-- | vm/vm_resident.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/vm/vm_kern.c b/vm/vm_kern.c index eb1e079..b83c058 100644 --- a/vm/vm_kern.c +++ b/vm/vm_kern.c @@ -35,7 +35,7 @@ */ #include <mach/kern_return.h> -#include "vm_param.h" +#include <machine/vm_param.h> #include <kern/assert.h> #include <kern/lock.h> #include <kern/thread.h> diff --git a/vm/vm_object.c b/vm/vm_object.c index 801fb06..8b57205 100644 --- a/vm/vm_object.c +++ b/vm/vm_object.c @@ -43,7 +43,7 @@ #include <mach/memory_object.h> #include "memory_object_default.h" #include "memory_object_user.h" -#include "vm_param.h" +#include <machine/vm_param.h> #include <ipc/ipc_port.h> #include <ipc/ipc_space.h> #include <kern/assert.h> diff --git a/vm/vm_resident.c b/vm/vm_resident.c index 4ab39f4..3c5af1c 100644 --- a/vm/vm_resident.c +++ b/vm/vm_resident.c @@ -40,7 +40,7 @@ #include <kern/task.h> #include <kern/thread.h> #include <mach/vm_statistics.h> -#include "vm_param.h" +#include <machine/vm_param.h> #include <kern/xpr.h> #include <kern/zalloc.h> #include <vm/pmap.h> |