From 536a02b74d0908ad61b58beb4ed66f3fa1bfb546 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Sun, 15 Oct 2006 13:37:14 +0000 Subject: 2006-10-15 Thomas Schwinge [task #5956 --- ``Automake'ify GNU Mach's code base''] * configfrag.ac: New file. * tests/configfrag.ac: Likewise. * Makerules.am (DEFINES): Convert those into... * configfrag.ac: ... AC_DEFINE instantiations. * i386/Makerules.in (DEFINES): Convert those into... * i386/configfrag.ac: ... AC_DEFINE instantiations. * i386/Makerules.in: Remove file. * i386/configfrag.ac (AC_PREREQ, AC_INIT, AC_CONFIG_SRCDIR) (AC_CONFIG_SUBDIRS, AC_CONFIG_FILES, AC_OUTPUT): Don't invoke. (../version.m4): Don't include. (--disable-lpr): Rework configuration option. (--disable-default-device-drivers): Move configuration option to... * configfrag.ac: ... here. * configure.ac (AC_CONFIG_AUX_DIR, AM_INIT_AUTOMAKE): Instantiate. (AC_PREFIX_DEFAULT, AC_CONFIG_SUBDIRS): Don't invoke. : Rework the whole section. (--enable-kdb, --disable-kmsg): Move into `configfrag.ac' and adopt. (AM_PROG_AS, AM_PROG_CC_C_O): Instantiate. (AC_CHECK_PROG): Move instantiation searching for a `mbchk' program into `tests/configfrag.ac'. (AC_CHECK_PROG): Instantiate to search for a `patch' program. (tests/configfrag.ac, configfrag.ac) (linux/configfrag.ac): Include files. (i386/configfrag.ac): Include file if appropriate. (AC_CONFIG_HEADER): Instantiate for `config.h'. (AC_CONFIG_FILES): Remove `Makerules' and `doc/Makefile'. (AC_CONFIG_COMMANDS_POST): Instantiate for `config.status.dep.patch'. (AC_CONFIG_COMMANDS): Instantiate for `Makefile.correct_output_files_for_.S_files.patch' and (the nonexistent) `Makefile.dependency_tracking_for_.S_files.patch'. * Makefile.dependency_tracking_for_.S_files.patch: New file. * config.status.dep.patch: Likewise. * bogus/bootstrap_symbols.h: Remove file. * configfrag.ac: AC_DEFINE `BOOTSTRAP_SYMBOLS' to `0'. * bogus/cpus.h: Remove file. * configfrag.ac: AC_DEFINE `NCPUS' to `1'. AH_TEMPLATE `MULTIPROCESSOR'. * bogus/fast_tas.h: Remove file. * configfrag.ac: AC_DEFINE `FAST_TAS' to `0'. * bogus/hw_footprint.h: Remove file. * configfrag.ac: AC_DEFINE `HW_FOOTPRINT' to `0'. * bogus/mach_counters.h: Remove file. * configfrag.ac: AC_DEFINE `MACH_COUNTERS' to `0'. * bogus/mach_debug.h: Remove file. * configfrag.ac: AC_DEFINE `MACH_DEBUG' to `1'. * bogus/mach_fixpri.h: Remove file. * configfrag.ac: AC_DEFINE `MACH_FIXPRI' to `1'. * bogus/mach_host.h: Remove file. * configfrag.ac: AC_DEFINE `MACH_HOST' to `0'. * bogus/mach_ipc_compat.h: Remove file. * configfrag.ac: AC_DEFINE `MACH_IPC_COMPAT' to `1'. * bogus/mach_ipc_debug.h: Remove file. * configfrag.ac: AC_DEFINE `MACH_IPC_DEBUG' to `1'. * bogus/mach_ipc_test.h: Remove file. * configfrag.ac: AC_DEFINE `MACH_IPC_TEST' to `0'. * bogus/mach_kdb.h: Remove file. * configfrag.ac (--disable-kdb): AC_DEFINE `MACH_KDB' to `0'. * bogus/mach_ldebug.h: Remove file. * configfrag.ac: AC_DEFINE `MACH_LDEBUG' to `0'. * bogus/mach_lock_mon.h: Remove file. * configfrag.ac: AC_DEFINE `MACH_LOCK_MON' to `0'. * bogus/mach_machine_routines.h: Remove file. * configfrag.ac: Add comment about not AC_DEFINEing `MACH_MACHINE_ROUTINES' to `0'. * bogus/mach_mp_debug.h: Remove file. * configfrag.ac: AC_DEFINE `MACH_MP_DEBUG' to `0'. * bogus/mach_pagemap.h: Remove file. * configfrag.ac: AC_DEFINE `MACH_PAGEMAP' to `1'. * bogus/mach_pcsample.h: Remove file. * configfrag.ac: AC_DEFINE `MACH_PCSAMPLE' to `1'. * bogus/mach_ttd.h: Remove file. * configfrag.ac: AC_DEFINE `MACH_TTD' to `0'. * bogus/mach_vm_debug.h: Remove file. * configfrag.ac: AC_DEFINE `MACH_VM_DEBUG' to `1'. * bogus/power_save.h: Remove file. * configfrag.ac: AC_DEFINE `POWER_SAVE' to `1'. * bogus/simple_clock.h: Remove file. * configfrag.ac: AC_DEFINE `SIMPLE_CLOCK' to `0'. * bogus/stat_time.h: Remove file. * configfrag.ac: AC_DEFINE `STAT_TIME' to `1'. * bogus/xpr_debug.h: Remove file. * configfrag.ac: AC_DEFINE `XPR_DEBUG' to `1'. * i386/bogus/com.h: Remove file. * i386/configfrag.ac: AC_DEFINE `NCOM' to `4'. * i386/bogus/fpe.h: Remove file. * i386/configfrag.ac: AC_DEFINE `FPE' to `0'. * i386/bogus/lpr.h: Remove file. * i386/configfrag.ac: AC_DEFINE `NLPR' to `1'. * i386/bogus/mach_machine_routines.h: Remove file. * i386/configfrag.ac: AC_DEFINE `MACH_MACHINE_ROUTINES' to `1'. * i386/bogus/platforms.h: Remove file. * i386/configfrag.ac: AC_DEFINE `AT386' to `1'. * i386/bogus/rc.h: Remove file. * i386/configfrag.ac: AC_DEFINE `RCLINE' to `-1' and `RCADDR' to `0x3f8'. --- i386/Makerules.in | 46 ------------------------ i386/bogus/com.h | 2 -- i386/bogus/fpe.h | 2 -- i386/bogus/lpr.h | 1 - i386/bogus/mach_machine_routines.h | 1 - i386/bogus/platforms.h | 1 - i386/bogus/rc.h | 16 --------- i386/configfrag.ac | 71 +++++++++++++++++++++++++++----------- 8 files changed, 50 insertions(+), 90 deletions(-) delete mode 100644 i386/Makerules.in delete mode 100644 i386/bogus/com.h delete mode 100644 i386/bogus/fpe.h delete mode 100644 i386/bogus/lpr.h delete mode 100644 i386/bogus/mach_machine_routines.h delete mode 100644 i386/bogus/platforms.h delete mode 100644 i386/bogus/rc.h (limited to 'i386') diff --git a/i386/Makerules.in b/i386/Makerules.in deleted file mode 100644 index 9f09bcc..0000000 --- a/i386/Makerules.in +++ /dev/null @@ -1,46 +0,0 @@ -# i386/Makerules -# Copyright 2006 Free Software Foundation, Inc. -# -# Permission to use, copy, modify and distribute this software and its -# documentation is hereby granted, provided that both the copyright -# notice and this permission notice appear in all copies of the -# software, derivative works or modified versions, and any portions -# thereof, and that both notices appear in supporting documentation. -# -# THE FREE SOFTWARE FOUNDATION ALLOWS FREE USE OF THIS SOFTWARE IN ITS -# "AS IS" CONDITION. THE FREE SOFTWARE FOUNDATION DISCLAIMS ANY -# LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE -# USE OF THIS SOFTWARE. - - -# -# configure's findings. -# - -DEFS-$(systype) = @DEFS@ - - -# -# Glue code dependent Makerules -# - -include $(abs_top_builddir)/$(systype)/linux/Makerules - - -# Some of the i386-specific code checks for these. -DEFINES += -DCONTINUATIONS -D__ELF__ -Di386 $(DEFS-$(systype)) - -# The system specific ones always override the generic ones. -INCLUDES += -I$(abs_top_srcdir)/$(systype)/bogus - -# i386 specific linker script. -LDFLAGS-kernel += -T $(abs_top_srcdir)/$(systype)/ldscript - -# -# Autoconf support -# - -$(abs_top_builddir)/$(systype)/Makerules: \ - $(abs_top_srcdir)/$(systype)/Makerules.in \ - $(abs_top_builddir)/$(systype)/config.status - cd $(abs_top_builddir)/$(systype) && ./config.status $(@F) diff --git a/i386/bogus/com.h b/i386/bogus/com.h deleted file mode 100644 index ea7ad7a..0000000 --- a/i386/bogus/com.h +++ /dev/null @@ -1,2 +0,0 @@ -#define NCOM 4 - diff --git a/i386/bogus/fpe.h b/i386/bogus/fpe.h deleted file mode 100644 index 3850b40..0000000 --- a/i386/bogus/fpe.h +++ /dev/null @@ -1,2 +0,0 @@ -/* We do not have a floating point implementation. */ -#define FPE 0 diff --git a/i386/bogus/lpr.h b/i386/bogus/lpr.h deleted file mode 100644 index 02a8ebf..0000000 --- a/i386/bogus/lpr.h +++ /dev/null @@ -1 +0,0 @@ -#define NLPR 1 diff --git a/i386/bogus/mach_machine_routines.h b/i386/bogus/mach_machine_routines.h deleted file mode 100644 index bf7bab5..0000000 --- a/i386/bogus/mach_machine_routines.h +++ /dev/null @@ -1 +0,0 @@ -#define MACH_MACHINE_ROUTINES 1 diff --git a/i386/bogus/platforms.h b/i386/bogus/platforms.h deleted file mode 100644 index c4d0a24..0000000 --- a/i386/bogus/platforms.h +++ /dev/null @@ -1 +0,0 @@ -#define AT386 1 diff --git a/i386/bogus/rc.h b/i386/bogus/rc.h deleted file mode 100644 index 7bbe598..0000000 --- a/i386/bogus/rc.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * This controls whether or not we use a serial line for the console - * (ie, remote console). - */ - -/* - * Values for RCLINE: - * -1 = disable - * 0 = port 0x3f8/irq 4 (DOS COM1) - * 1 = port 0x2f8/irq 3 (DOS COM2) - * 2 = port 0x3e8/irq 5 (DOS COM3) - * 3 = port 0x2e8/irq 9 (DOS COM4) - */ - -#define RCLINE -1 /* com port for console */ -#define RCADDR 0x3f8 /* where it is */ diff --git a/i386/configfrag.ac b/i386/configfrag.ac index 98fe2b1..a6c0d7a 100644 --- a/i386/configfrag.ac +++ b/i386/configfrag.ac @@ -1,4 +1,5 @@ -dnl Configure script for i386 +dnl Configure fragment for i386. + dnl Copyright 1999, 2004, 2006 Free Software Foundation, Inc. dnl Permission to use, copy, modify and distribute this software and its @@ -12,32 +13,60 @@ dnl "AS IS" CONDITION. THE FREE SOFTWARE FOUNDATION DISCLAIMS ANY dnl LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE dnl USE OF THIS SOFTWARE. -AC_PREREQ([2.57]) +# +# Definitions. +# + +# Some of the i386-specific code checks for these. +AC_DEFINE([CONTINUATIONS], [1], [CONTINUATIONS]) +AC_DEFINE([__ELF__], [1], [__ELF__]) +AC_DEFINE([i386], [1], [i386]) + +# +# Formerly in `i386/bogus/'. +# + +# i386/bogus/com.h +AC_DEFINE([NCOM], [4], [NCOM]) + +# i386/bogus/fpe.h +AC_DEFINE([FPE], [0], [We do not have a floating point implementation.]) -m4_include([../version.m4]) -AC_INIT([AC_PACKAGE_NAME], [AC_PACKAGE_VERSION], [AC_PACKAGE_BUGREPORT], [AC_PACKAGE_TARNAME]) -AC_CONFIG_SRCDIR([i386/i386asm.sym]) +# i386/bogus/lpr.h +AC_DEFINE([NLPR], [1], [NLPR]) + +# i386/bogus/mach_machine_routines.h +AC_DEFINE([MACH_MACHINE_ROUTINES], [1], [MACH_MACHINE_ROUTINES]) + +# i386/bogus/platforms.h +AC_DEFINE([AT386], [1], [AT386]) + +# i386/bogus/rc.h +# +# This controls whether or not we use a serial line for the console +# (ie, remote console). +# +# +# Values for RCLINE: +# -1 = disable +# 0 = port 0x3f8/irq 4 (DOS COM1) +# 1 = port 0x2f8/irq 3 (DOS COM2) +# 2 = port 0x3e8/irq 5 (DOS COM3) +# 3 = port 0x2e8/irq 9 (DOS COM4) +# +AC_DEFINE([RCLINE], [-1], [com port for the remote console]) +AC_DEFINE([RCADDR], [0x3f8], [where is the com port for the remote console]) # -# Options +# Options. # -AC_ARG_ENABLE([default-device-drivers], -AS_HELP_STRING([--disable-default-device-drivers], [have all device drivers -disabled that can be disabled and would otherwise have been enabled by default; -then use the `--enable-*' options to enable only those you actually want to -have enabled])) -[if test x"$enable_default_device_drivers" != xno -then enable_default_device_drivers=yes -fi] AC_ARG_ENABLE([lpr], AS_HELP_STRING([--disable-lpr], [disable use of lpr device])) [enable_lpr=${enable_lpr-$enable_default_device_drivers} -if test x"$enable_lpr" = xyes -then] AC_DEFINE([MACH_LPR], [], [enable mach lpr]) +if [ x"$enable_lpr" = xyes ]; then] + AC_DEFINE([MACH_LPR], [], [lpr device]) + AM_CONDITIONAL([enable_lpr], [true]) +[else] + AM_CONDITIONAL([enable_lpr], [false]) [fi] - -AC_CONFIG_SUBDIRS([linux]) - -AC_CONFIG_FILES([Makefile Makerules]) -AC_OUTPUT -- cgit v1.2.3