mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-10 22:10:21 +02:00
Aggregate makefiles for module/system' and module/language'.
* am/guilec (.scm.go): Create the target's directory, in case $(builddir) != $(srcdir). * configure.in: Don't output any makefile under `module/system' or `module/language'. * module/Makefile.am (SUBDIRS): Remove `language' and `system'. Add `.' to the front. (modpath, SOURCES, SCHEME_LANG_SOURCES, ECMASCRIPT_LANG_SOURCES, GHIL_LANG_SOURCES, GLIL_LANG_SOURCES, ASSEMBLY_LANG_SOURCES, BYTECODE_LANG_SOURCES, OBJCODE_LANG_SOURCES, VALUE_LANG_SOURCES): New variables, taken from former `Makefile.am' files in sub-directories.
This commit is contained in:
Ludovic Courtès
parent
c15fa41c0c
commit
3bb299b3f0
15 changed files with 88 additions and 60 deletions
|
|
@ -9,4 +9,5 @@ CLEANFILES = $(GOBJECTS)
|
|||
|
||||
SUFFIXES = .scm .go
|
||||
.scm.go:
|
||||
$(MKDIR_P) `dirname $@`
|
||||
$(top_builddir)/pre-inst-guile-env $(top_builddir)/guile-tools compile -o "$@" "$<"
|
||||
|
|
|
|||
14
configure.in
14
configure.in
|
|
@ -4,7 +4,7 @@ dnl
|
|||
|
||||
define(GUILE_CONFIGURE_COPYRIGHT,[[
|
||||
|
||||
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
||||
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GUILE
|
||||
|
||||
|
|
@ -1550,18 +1550,6 @@ AC_CONFIG_FILES([
|
|||
test-suite/Makefile
|
||||
test-suite/standalone/Makefile
|
||||
module/Makefile
|
||||
module/system/Makefile
|
||||
module/system/base/Makefile
|
||||
module/system/vm/Makefile
|
||||
module/system/repl/Makefile
|
||||
module/language/Makefile
|
||||
module/language/scheme/Makefile
|
||||
module/language/ghil/Makefile
|
||||
module/language/glil/Makefile
|
||||
module/language/assembly/Makefile
|
||||
module/language/bytecode/Makefile
|
||||
module/language/objcode/Makefile
|
||||
module/language/value/Makefile
|
||||
module/ice-9/Makefile
|
||||
module/ice-9/debugger/Makefile
|
||||
module/ice-9/debugging/Makefile
|
||||
|
|
|
|||
|
|
@ -1 +1,86 @@
|
|||
SUBDIRS = system language ice-9 srfi oop
|
||||
## Process this file with automake to produce Makefile.in.
|
||||
##
|
||||
## Copyright (C) 2009 Free Software Foundation, Inc.
|
||||
##
|
||||
## This file is part of GUILE.
|
||||
##
|
||||
## GUILE is free software; you can redistribute it and/or modify
|
||||
## it under the terms of the GNU General Public License as
|
||||
## published by the Free Software Foundation; either version 2, or
|
||||
## (at your option) any later version.
|
||||
##
|
||||
## GUILE is distributed in the hope that it will be useful, but
|
||||
## WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
## GNU General Public License for more details.
|
||||
##
|
||||
## You should have received a copy of the GNU General Public
|
||||
## License along with GUILE; see the file COPYING. If not, write
|
||||
## to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
|
||||
## Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
# Build the compiler and VM support first to avoid stack overflows
|
||||
# when building the rest.
|
||||
SUBDIRS = . ice-9 srfi oop
|
||||
|
||||
# We're at the root of the module hierarchy.
|
||||
modpath =
|
||||
|
||||
SOURCES = \
|
||||
system/base/pmatch.scm system/base/syntax.scm \
|
||||
system/base/compile.scm system/base/language.scm \
|
||||
\
|
||||
system/vm/debug.scm system/vm/frame.scm system/vm/instruction.scm \
|
||||
system/vm/objcode.scm system/vm/profile.scm system/vm/program.scm \
|
||||
system/vm/trace.scm system/vm/vm.scm \
|
||||
\
|
||||
system/repl/repl.scm system/repl/common.scm \
|
||||
system/repl/command.scm \
|
||||
\
|
||||
language/ghil.scm language/glil.scm language/assembly.scm \
|
||||
\
|
||||
$(SCHEME_LANG_SOURCES) $(ECMASCRIPT_LANG_SOURCES) \
|
||||
$(GHIL_LANG_SOURCES) $(GLIL_LANG_SOURCES) \
|
||||
$(ASSEMBLY_LANG_SOURCES) $(BYTECODE_LANG_SOURCES) \
|
||||
$(OBJCODE_LANG_SOURCES) $(VALUE_LANG_SOURCES)
|
||||
|
||||
SCHEME_LANG_SOURCES = \
|
||||
language/scheme/compile-ghil.scm language/scheme/spec.scm \
|
||||
language/scheme/inline.scm
|
||||
|
||||
GHIL_LANG_SOURCES = \
|
||||
language/ghil/spec.scm language/ghil/compile-glil.scm
|
||||
|
||||
GLIL_LANG_SOURCES = \
|
||||
language/glil/spec.scm language/glil/compile-assembly.scm
|
||||
|
||||
ASSEMBLY_LANG_SOURCES = \
|
||||
language/assembly/spec.scm \
|
||||
language/assembly/compile-bytecode.scm \
|
||||
language/assembly/decompile-bytecode.scm \
|
||||
language/assembly/disassemble.scm
|
||||
|
||||
BYTECODE_LANG_SOURCES = \
|
||||
language/bytecode/spec.scm
|
||||
|
||||
OBJCODE_LANG_SOURCES = \
|
||||
language/objcode/spec.scm
|
||||
|
||||
VALUE_LANG_SOURCES = \
|
||||
language/value/spec.scm
|
||||
|
||||
ECMASCRIPT_LANG_SOURCES = \
|
||||
language/ecmascript/parse-lalr.scm \
|
||||
language/ecmascript/tokenize.scm \
|
||||
language/ecmascript/parse.scm \
|
||||
language/ecmascript/spec.scm \
|
||||
language/ecmascript/impl.scm \
|
||||
language/ecmascript/base.scm \
|
||||
language/ecmascript/function.scm \
|
||||
language/ecmascript/array.scm \
|
||||
language/ecmascript/compile-ghil.scm
|
||||
|
||||
NOCOMP_SOURCES = \
|
||||
system/repl/describe.scm
|
||||
|
||||
include $(top_srcdir)/am/guilec
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
SUBDIRS=scheme ghil glil assembly bytecode objcode value
|
||||
SOURCES=ghil.scm glil.scm assembly.scm \
|
||||
ecmascript/parse-lalr.scm \
|
||||
ecmascript/tokenize.scm \
|
||||
ecmascript/parse.scm \
|
||||
ecmascript/spec.scm \
|
||||
ecmascript/impl.scm \
|
||||
ecmascript/base.scm \
|
||||
ecmascript/function.scm \
|
||||
ecmascript/array.scm \
|
||||
ecmascript/compile-ghil.scm
|
||||
modpath = language
|
||||
include $(top_srcdir)/am/guilec
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
SOURCES = spec.scm compile-bytecode.scm decompile-bytecode.scm disassemble.scm
|
||||
modpath = language/assembly
|
||||
include $(top_srcdir)/am/guilec
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
SOURCES = spec.scm
|
||||
modpath = language/bytecode
|
||||
include $(top_srcdir)/am/guilec
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
SOURCES = spec.scm compile-glil.scm
|
||||
modpath = language/ghil
|
||||
include $(top_srcdir)/am/guilec
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
SOURCES = spec.scm compile-assembly.scm
|
||||
modpath = language/glil
|
||||
include $(top_srcdir)/am/guilec
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
SOURCES = spec.scm
|
||||
modpath = language/objcode
|
||||
include $(top_srcdir)/am/guilec
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
SOURCES = compile-ghil.scm spec.scm inline.scm
|
||||
modpath = language/scheme
|
||||
include $(top_srcdir)/am/guilec
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
SOURCES = spec.scm
|
||||
modpath = language/value
|
||||
include $(top_srcdir)/am/guilec
|
||||
|
|
@ -1 +0,0 @@
|
|||
SUBDIRS = base vm repl
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
SOURCES = pmatch.scm syntax.scm compile.scm language.scm
|
||||
modpath = system/base
|
||||
include $(top_srcdir)/am/guilec
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
NOCOMP_SOURCES = describe.scm
|
||||
SOURCES = repl.scm common.scm command.scm
|
||||
modpath = system/repl
|
||||
include $(top_srcdir)/am/guilec
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
SOURCES = debug.scm frame.scm instruction.scm objcode.scm \
|
||||
profile.scm program.scm trace.scm vm.scm
|
||||
modpath = system/vm
|
||||
include $(top_srcdir)/am/guilec
|
||||
Loading…
Add table
Add a link
Reference in a new issue