From ea93465de79826ca8bbd3689bfbccca58e8d9353 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Sat, 1 Nov 2008 13:49:23 +0100 Subject: [PATCH] move scm srfi files to module/srfi, and compile them. * .gitignore: Add gdb-pre-inst-guile. * configure.in: Add module/srfi/Makefile. * module/Makefile.am: Add srfi/. * module/srfi/: SRFI scheme files moved here, and compiled. * srfi/Makefile.am: Remove the bits about the scheme files. --- .gitignore | 1 + configure.in | 1 + module/Makefile.am | 2 +- module/srfi/Makefile.am | 52 +++++++++++++++++++++++++++++++ {srfi => module/srfi}/srfi-1.scm | 0 {srfi => module/srfi}/srfi-10.scm | 0 {srfi => module/srfi}/srfi-11.scm | 0 {srfi => module/srfi}/srfi-13.scm | 0 {srfi => module/srfi}/srfi-14.scm | 0 {srfi => module/srfi}/srfi-16.scm | 0 {srfi => module/srfi}/srfi-17.scm | 0 {srfi => module/srfi}/srfi-18.scm | 0 {srfi => module/srfi}/srfi-19.scm | 0 {srfi => module/srfi}/srfi-2.scm | 0 {srfi => module/srfi}/srfi-26.scm | 0 {srfi => module/srfi}/srfi-31.scm | 0 {srfi => module/srfi}/srfi-34.scm | 0 {srfi => module/srfi}/srfi-35.scm | 0 {srfi => module/srfi}/srfi-37.scm | 0 {srfi => module/srfi}/srfi-39.scm | 0 {srfi => module/srfi}/srfi-4.scm | 0 {srfi => module/srfi}/srfi-6.scm | 0 {srfi => module/srfi}/srfi-60.scm | 0 {srfi => module/srfi}/srfi-69.scm | 0 {srfi => module/srfi}/srfi-8.scm | 0 {srfi => module/srfi}/srfi-88.scm | 0 {srfi => module/srfi}/srfi-9.scm | 0 srfi/Makefile.am | 27 +--------------- 28 files changed, 56 insertions(+), 27 deletions(-) create mode 100644 module/srfi/Makefile.am rename {srfi => module/srfi}/srfi-1.scm (100%) rename {srfi => module/srfi}/srfi-10.scm (100%) rename {srfi => module/srfi}/srfi-11.scm (100%) rename {srfi => module/srfi}/srfi-13.scm (100%) rename {srfi => module/srfi}/srfi-14.scm (100%) rename {srfi => module/srfi}/srfi-16.scm (100%) rename {srfi => module/srfi}/srfi-17.scm (100%) rename {srfi => module/srfi}/srfi-18.scm (100%) rename {srfi => module/srfi}/srfi-19.scm (100%) rename {srfi => module/srfi}/srfi-2.scm (100%) rename {srfi => module/srfi}/srfi-26.scm (100%) rename {srfi => module/srfi}/srfi-31.scm (100%) rename {srfi => module/srfi}/srfi-34.scm (100%) rename {srfi => module/srfi}/srfi-35.scm (100%) rename {srfi => module/srfi}/srfi-37.scm (100%) rename {srfi => module/srfi}/srfi-39.scm (100%) rename {srfi => module/srfi}/srfi-4.scm (100%) rename {srfi => module/srfi}/srfi-6.scm (100%) rename {srfi => module/srfi}/srfi-60.scm (100%) rename {srfi => module/srfi}/srfi-69.scm (100%) rename {srfi => module/srfi}/srfi-8.scm (100%) rename {srfi => module/srfi}/srfi-88.scm (100%) rename {srfi => module/srfi}/srfi-9.scm (100%) diff --git a/.gitignore b/.gitignore index 3ba3b6f35..f5953c90e 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ TAGS guile-1.8.pc lib/alloca.h lib/strings.h +gdb-pre-inst-guile diff --git a/configure.in b/configure.in index 56b74e229..881a472a1 100644 --- a/configure.in +++ b/configure.in @@ -1560,6 +1560,7 @@ AC_CONFIG_FILES([ module/ice-9/Makefile module/ice-9/debugger/Makefile module/ice-9/debugging/Makefile + module/srfi/Makefile module/oop/Makefile module/oop/goops/Makefile testsuite/Makefile diff --git a/module/Makefile.am b/module/Makefile.am index feefcdfb0..0dbb1b9cc 100644 --- a/module/Makefile.am +++ b/module/Makefile.am @@ -1 +1 @@ -SUBDIRS = system language ice-9 oop +SUBDIRS = system language ice-9 srfi oop diff --git a/module/srfi/Makefile.am b/module/srfi/Makefile.am new file mode 100644 index 000000000..0fc926e40 --- /dev/null +++ b/module/srfi/Makefile.am @@ -0,0 +1,52 @@ +## Process this file with automake to produce Makefile.in. +## +## Copyright (C) 2000, 2004, 2006, 2008 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 + +AUTOMAKE_OPTIONS = gnu + +modpath = srfi +SOURCES = \ + srfi-1.scm \ + srfi-2.scm \ + srfi-4.scm \ + srfi-6.scm \ + srfi-8.scm \ + srfi-9.scm \ + srfi-10.scm \ + srfi-11.scm \ + srfi-13.scm \ + srfi-14.scm \ + srfi-16.scm \ + srfi-17.scm \ + srfi-19.scm \ + srfi-26.scm \ + srfi-31.scm \ + srfi-34.scm \ + srfi-35.scm \ + srfi-37.scm \ + srfi-39.scm \ + srfi-60.scm \ + srfi-69.scm \ + srfi-88.scm + +# Will poke this later. +NOCOMP_SOURCES = srfi-18.scm + +include $(top_srcdir)/am/guilec diff --git a/srfi/srfi-1.scm b/module/srfi/srfi-1.scm similarity index 100% rename from srfi/srfi-1.scm rename to module/srfi/srfi-1.scm diff --git a/srfi/srfi-10.scm b/module/srfi/srfi-10.scm similarity index 100% rename from srfi/srfi-10.scm rename to module/srfi/srfi-10.scm diff --git a/srfi/srfi-11.scm b/module/srfi/srfi-11.scm similarity index 100% rename from srfi/srfi-11.scm rename to module/srfi/srfi-11.scm diff --git a/srfi/srfi-13.scm b/module/srfi/srfi-13.scm similarity index 100% rename from srfi/srfi-13.scm rename to module/srfi/srfi-13.scm diff --git a/srfi/srfi-14.scm b/module/srfi/srfi-14.scm similarity index 100% rename from srfi/srfi-14.scm rename to module/srfi/srfi-14.scm diff --git a/srfi/srfi-16.scm b/module/srfi/srfi-16.scm similarity index 100% rename from srfi/srfi-16.scm rename to module/srfi/srfi-16.scm diff --git a/srfi/srfi-17.scm b/module/srfi/srfi-17.scm similarity index 100% rename from srfi/srfi-17.scm rename to module/srfi/srfi-17.scm diff --git a/srfi/srfi-18.scm b/module/srfi/srfi-18.scm similarity index 100% rename from srfi/srfi-18.scm rename to module/srfi/srfi-18.scm diff --git a/srfi/srfi-19.scm b/module/srfi/srfi-19.scm similarity index 100% rename from srfi/srfi-19.scm rename to module/srfi/srfi-19.scm diff --git a/srfi/srfi-2.scm b/module/srfi/srfi-2.scm similarity index 100% rename from srfi/srfi-2.scm rename to module/srfi/srfi-2.scm diff --git a/srfi/srfi-26.scm b/module/srfi/srfi-26.scm similarity index 100% rename from srfi/srfi-26.scm rename to module/srfi/srfi-26.scm diff --git a/srfi/srfi-31.scm b/module/srfi/srfi-31.scm similarity index 100% rename from srfi/srfi-31.scm rename to module/srfi/srfi-31.scm diff --git a/srfi/srfi-34.scm b/module/srfi/srfi-34.scm similarity index 100% rename from srfi/srfi-34.scm rename to module/srfi/srfi-34.scm diff --git a/srfi/srfi-35.scm b/module/srfi/srfi-35.scm similarity index 100% rename from srfi/srfi-35.scm rename to module/srfi/srfi-35.scm diff --git a/srfi/srfi-37.scm b/module/srfi/srfi-37.scm similarity index 100% rename from srfi/srfi-37.scm rename to module/srfi/srfi-37.scm diff --git a/srfi/srfi-39.scm b/module/srfi/srfi-39.scm similarity index 100% rename from srfi/srfi-39.scm rename to module/srfi/srfi-39.scm diff --git a/srfi/srfi-4.scm b/module/srfi/srfi-4.scm similarity index 100% rename from srfi/srfi-4.scm rename to module/srfi/srfi-4.scm diff --git a/srfi/srfi-6.scm b/module/srfi/srfi-6.scm similarity index 100% rename from srfi/srfi-6.scm rename to module/srfi/srfi-6.scm diff --git a/srfi/srfi-60.scm b/module/srfi/srfi-60.scm similarity index 100% rename from srfi/srfi-60.scm rename to module/srfi/srfi-60.scm diff --git a/srfi/srfi-69.scm b/module/srfi/srfi-69.scm similarity index 100% rename from srfi/srfi-69.scm rename to module/srfi/srfi-69.scm diff --git a/srfi/srfi-8.scm b/module/srfi/srfi-8.scm similarity index 100% rename from srfi/srfi-8.scm rename to module/srfi/srfi-8.scm diff --git a/srfi/srfi-88.scm b/module/srfi/srfi-88.scm similarity index 100% rename from srfi/srfi-88.scm rename to module/srfi/srfi-88.scm diff --git a/srfi/srfi-9.scm b/module/srfi/srfi-9.scm similarity index 100% rename from srfi/srfi-9.scm rename to module/srfi/srfi-9.scm diff --git a/srfi/Makefile.am b/srfi/Makefile.am index 048898dce..02fa12b04 100644 --- a/srfi/Makefile.am +++ b/srfi/Makefile.am @@ -64,32 +64,7 @@ libguile_srfi_srfi_60_v_@LIBGUILE_SRFI_SRFI_60_MAJOR@_la_LIBADD = \ $(top_builddir)/libguile/libguile.la $(top_builddir)/lib/libgnu.la libguile_srfi_srfi_60_v_@LIBGUILE_SRFI_SRFI_60_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -version-info @LIBGUILE_SRFI_SRFI_60_INTERFACE@ -srfidir = $(datadir)/guile/$(GUILE_EFFECTIVE_VERSION)/srfi -srfi_DATA = srfi-1.scm \ - srfi-2.scm \ - srfi-4.scm \ - srfi-6.scm \ - srfi-8.scm \ - srfi-9.scm \ - srfi-10.scm \ - srfi-11.scm \ - srfi-13.scm \ - srfi-14.scm \ - srfi-16.scm \ - srfi-17.scm \ - srfi-19.scm \ - srfi-26.scm \ - srfi-31.scm \ - srfi-34.scm \ - srfi-35.scm \ - srfi-37.scm \ - srfi-39.scm \ - srfi-60.scm \ - srfi-69.scm \ - srfi-88.scm - -EXTRA_DIST = $(srfi_DATA) ChangeLog-2008 -TAGS_FILES = $(srfi_DATA) +EXTRA_DIST = ChangeLog-2008 GUILE_SNARF = ../libguile/guile-snarf -- 2.20.1