summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac12
-rw-r--r--srfi/Makefile.am16
-rw-r--r--srfi/srfi-13.c41
-rw-r--r--srfi/srfi-13.h57
-rw-r--r--srfi/srfi-14.c35
-rw-r--r--srfi/srfi-14.h39
-rw-r--r--srfi/srfi-4.c37
-rw-r--r--srfi/srfi-4.h28
8 files changed, 2 insertions, 263 deletions
diff --git a/configure.ac b/configure.ac
index 915f01e54..513f7ed06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1553,18 +1553,6 @@ AC_SUBST(LIBGUILE_SRFI_SRFI_1_INTERFACE_REVISION)
AC_SUBST(LIBGUILE_SRFI_SRFI_1_INTERFACE_AGE)
AC_SUBST(LIBGUILE_SRFI_SRFI_1_INTERFACE)
-AC_SUBST(LIBGUILE_SRFI_SRFI_4_MAJOR)
-AC_SUBST(LIBGUILE_SRFI_SRFI_4_INTERFACE_CURRENT)
-AC_SUBST(LIBGUILE_SRFI_SRFI_4_INTERFACE_REVISION)
-AC_SUBST(LIBGUILE_SRFI_SRFI_4_INTERFACE_AGE)
-AC_SUBST(LIBGUILE_SRFI_SRFI_4_INTERFACE)
-
-AC_SUBST(LIBGUILE_SRFI_SRFI_13_14_MAJOR)
-AC_SUBST(LIBGUILE_SRFI_SRFI_13_14_INTERFACE_CURRENT)
-AC_SUBST(LIBGUILE_SRFI_SRFI_13_14_INTERFACE_REVISION)
-AC_SUBST(LIBGUILE_SRFI_SRFI_13_14_INTERFACE_AGE)
-AC_SUBST(LIBGUILE_SRFI_SRFI_13_14_INTERFACE)
-
AC_SUBST(LIBGUILE_SRFI_SRFI_60_MAJOR)
AC_SUBST(LIBGUILE_SRFI_SRFI_60_INTERFACE_CURRENT)
AC_SUBST(LIBGUILE_SRFI_SRFI_60_INTERFACE_REVISION)
diff --git a/srfi/Makefile.am b/srfi/Makefile.am
index 655d214b7..7785aff67 100644
--- a/srfi/Makefile.am
+++ b/srfi/Makefile.am
@@ -38,31 +38,19 @@ AM_LDFLAGS = $(GNU_LD_FLAGS)
srfiincludedir = $(pkgincludedir)/$(GUILE_EFFECTIVE_VERSION)/srfi
# These headers are visible as <guile/srfi/mumble.h>
-srfiinclude_HEADERS = srfi-1.h srfi-4.h srfi-13.h srfi-14.h srfi-60.h
+srfiinclude_HEADERS = srfi-1.h srfi-60.h
lib_LTLIBRARIES = \
libguile-srfi-srfi-1-v-@LIBGUILE_SRFI_SRFI_1_MAJOR@.la \
- libguile-srfi-srfi-4-v-@LIBGUILE_SRFI_SRFI_4_MAJOR@.la \
- libguile-srfi-srfi-13-14-v-@LIBGUILE_SRFI_SRFI_13_14_MAJOR@.la \
libguile-srfi-srfi-60-v-@LIBGUILE_SRFI_SRFI_60_MAJOR@.la
-BUILT_SOURCES = srfi-1.x srfi-4.x srfi-13.x srfi-14.x srfi-60.x
+BUILT_SOURCES = srfi-1.x srfi-60.x
libguile_srfi_srfi_1_v_@LIBGUILE_SRFI_SRFI_1_MAJOR@_la_SOURCES = srfi-1.c
libguile_srfi_srfi_1_v_@LIBGUILE_SRFI_SRFI_1_MAJOR@_la_LIBADD = \
$(top_builddir)/libguile/libguile-@GUILE_EFFECTIVE_VERSION@.la $(top_builddir)/lib/libgnu.la
libguile_srfi_srfi_1_v_@LIBGUILE_SRFI_SRFI_1_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -version-info @LIBGUILE_SRFI_SRFI_1_INTERFACE@
-libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_SOURCES = srfi-4.c
-libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LIBADD = \
- $(top_builddir)/libguile/libguile-@GUILE_EFFECTIVE_VERSION@.la $(top_builddir)/lib/libgnu.la
-libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -version-info @LIBGUILE_SRFI_SRFI_4_INTERFACE@
-
-libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_SOURCES = srfi-13.c srfi-14.c
-libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LIBADD = \
- $(top_builddir)/libguile/libguile-@GUILE_EFFECTIVE_VERSION@.la $(top_builddir)/lib/libgnu.la
-libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -version-info @LIBGUILE_SRFI_SRFI_13_14_INTERFACE@
-
libguile_srfi_srfi_60_v_@LIBGUILE_SRFI_SRFI_60_MAJOR@_la_SOURCES = srfi-60.c
libguile_srfi_srfi_60_v_@LIBGUILE_SRFI_SRFI_60_MAJOR@_la_LIBADD = \
$(top_builddir)/libguile/libguile-@GUILE_EFFECTIVE_VERSION@.la $(top_builddir)/lib/libgnu.la
diff --git a/srfi/srfi-13.c b/srfi/srfi-13.c
deleted file mode 100644
index 61a960e5d..000000000
--- a/srfi/srfi-13.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* srfi-13.c --- old place of SRFI-13 procedures for Guile
- *
- * Copyright (C) 2001, 2004, 2006, 2008 Free Software Foundation, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 3 of
- * the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-
-/* This file is now empty since all its procedures are now in the
- core. We keep the libguile-srfi-srfi-13.so library around anyway
- since people might still be linking with it.
-*/
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <srfi/srfi-13.h>
-
-void
-scm_init_srfi_13 (void)
-{
-}
-
-void
-scm_init_srfi_13_14 (void)
-{
-}
diff --git a/srfi/srfi-13.h b/srfi/srfi-13.h
deleted file mode 100644
index a110ffd6d..000000000
--- a/srfi/srfi-13.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef SCM_SRFI_13_H
-#define SCM_SRFI_13_H
-
-/* SRFI-13 procedures for Guile
- *
- * Copyright (C) 2001, 2004, 2006 Free Software Foundation, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 3 of
- * the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-
-/* All SRFI-13 procedures are in in the core now. */
-
-#include <libguile.h>
-
-/* SCM_SRFI1314_API is a macro prepended to all function and data definitions
- which should be exported or imported in the resulting dynamic link
- library in the Win32 port. */
-
-#if defined (SCM_SRFI1314_IMPORT)
-# define SCM_SRFI1314_API __declspec (dllimport) extern
-#elif defined (SCM_SRFI1314_EXPORT) || defined (DLL_EXPORT)
-# define SCM_SRFI1314_API __declspec (dllexport) extern
-#else
-# define SCM_SRFI1314_API extern
-#endif
-
-SCM_SRFI1314_API void scm_init_srfi_13 (void);
-SCM_SRFI1314_API void scm_init_srfi_13_14 (void);
-
-/* The following functions have new names in the core.
- */
-
-#define scm_string_to_listS scm_substring_to_list
-#define scm_string_copyS scm_substring_copy
-#define scm_substring_sharedS scm_substring_shared
-#define scm_string_fill_xS scm_substring_fill_x
-#define scm_string_indexS scm_string_index
-#define scm_string_upcase_xS scm_substring_upcase_x
-#define scm_string_upcaseS scm_substring_upcase
-#define scm_string_downcase_xS scm_substring_downcase_x
-#define scm_string_downcaseS scm_substring_downcase
-
-#endif /* SCM_SRFI_13_H */
diff --git a/srfi/srfi-14.c b/srfi/srfi-14.c
deleted file mode 100644
index 9f6ad8bc0..000000000
--- a/srfi/srfi-14.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* srfi-14.c --- Old place of SRFI-14 procedures for Guile
- *
- * Copyright (C) 2001, 2004, 2006, 2008 Free Software Foundation, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 3 of
- * the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <srfi/srfi-14.h>
-
-void
-scm_init_srfi_14 (void)
-{
-}
-
-void
-scm_c_init_srfi_14 (void)
-{
-}
diff --git a/srfi/srfi-14.h b/srfi/srfi-14.h
deleted file mode 100644
index a793159c5..000000000
--- a/srfi/srfi-14.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef SCM_SRFI_14_H
-#define SCM_SRFI_14_H
-/* srfi-14.c --- SRFI-14 procedures for Guile
- *
- * Copyright (C) 2001, 2004, 2006 Free Software Foundation, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 3 of
- * the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-
-/* SCM_SRFI1314_API is a macro prepended to all function and data definitions
- which should be exported or imported in the resulting dynamic link
- library in the Win32 port. */
-
-#if defined (SCM_SRFI1314_IMPORT)
-# define SCM_SRFI1314_API __declspec (dllimport) extern
-#elif defined (SCM_SRFI1314_EXPORT) || defined (DLL_EXPORT)
-# define SCM_SRFI1314_API __declspec (dllexport) extern
-#else
-# define SCM_SRFI1314_API extern
-#endif
-
-SCM_SRFI1314_API void scm_c_init_srfi_14 (void);
-SCM_SRFI1314_API void scm_init_srfi_14 (void);
-
-#endif /* SCM_SRFI_14_H */
diff --git a/srfi/srfi-4.c b/srfi/srfi-4.c
deleted file mode 100644
index 9b32b61a9..000000000
--- a/srfi/srfi-4.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* srfi-4.c --- Homogeneous numeric vector datatypes.
- *
- * Copyright (C) 2001, 2004, 2006, 2008 Free Software Foundation, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 3 of
- * the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-/* This file is now empty since all its procedures are now in the
- core. We keep the libguile-srfi-srfi-4.so library around anyway
- since people might still be linking with it.
-*/
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <srfi/srfi-4.h>
-
-void
-scm_init_srfi_4 (void)
-{
-}
-
-/* End of srfi-4.c. */
diff --git a/srfi/srfi-4.h b/srfi/srfi-4.h
deleted file mode 100644
index 0439675da..000000000
--- a/srfi/srfi-4.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef SCM_SRFI_SRFI_4_H
-#define SCM_SRFI_SRFI_4_H
-/* srfi-4.c --- Homogeneous numeric vector datatypes.
- *
- * Copyright (C) 2001, 2006 Free Software Foundation, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 3 of
- * the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-
-/* All SRFI-4 procedures are in in the core now. */
-
-#include <libguile.h>
-
-#endif /* SCM_SRFI_SRFI_4_H */