From 13d95988e4bc9c2956b29d4997aea20542aa9c26 Mon Sep 17 00:00:00 2001
From: Anthony Carrico <acarrico@memebeam.org>
Date: Wed, 7 May 2003 18:06:12 +0000
Subject: [PATCH] Added sunterlib.scm and sunterlib-48.scm to eventually
 replace (s48-)interfaces.scm and (s48-)packages.scm.

---
 Makefile | 14 ++++++++++----
 NEWS     |  6 ++++++
 README   | 13 +++++++------
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 368024f..929473a 100644
--- a/Makefile
+++ b/Makefile
@@ -55,8 +55,8 @@ scsh-blurbs := $(shell find scsh \
                  -maxdepth 2 -mindepth 2 \
                  -name BLURB)
 
-s48-targets := s48-interfaces.scm s48-packages.scm
-scsh-targets := interfaces.scm packages.scm
+s48-targets := s48-interfaces.scm s48-packages.scm sunterlib-s48.scm
+scsh-targets := interfaces.scm packages.scm sunterlib.scm
 targets := $(s48-targets) $(scsh-targets) DETAILS
 
 .PHONY: all s48 scsh
@@ -84,14 +84,20 @@ interfaces.scm : $(s48-interfaces) $(scsh-interfaces) build/header.scm
 packages.scm : $(s48-packages) $(scsh-packages) build/header.scm
 	build/xpackages.scm packages.scm build/header.scm $(s48-packages) $(scsh-packages)
 
+sunterlib-s48.scm : s48-interfaces.scm s48-packages.scm
+	cat s48-interfaces.scm s48-packages.scm > sunterlib-s48.scm
+
+sunterlib.scm : interfaces.scm packages.scm
+	cat interfaces.scm packages.scm > sunterlib.scm
+
 DETAILS : $(s48-authors) $(s48-blurbs) $(scsh-authors) $(scsh-blurbs)
 	build/details.scm
 
 .PHONY : install uninstall
 install : s48 scsh DETAILS
 	$(INSTALL) -d $(pkglibdir)
-	$(INSTALL_DATA) s48-interfaces.scm s48-packages.scm $(pkglibdir)
-	$(INSTALL_DATA) interfaces.scm packages.scm $(pkglibdir)
+	$(INSTALL_DATA) s48-interfaces.scm s48-packages.scm sunterlib-s48.scm $(pkglibdir)
+	$(INSTALL_DATA) interfaces.scm packages.scm sunterlib.scm $(pkglibdir)
 	$(INSTALL) -d $(pkgdocdir)
 	$(INSTALL_DATA) README $(pkgdocdir)
 	$(INSTALL_DATA) DETAILS $(pkgdocdir)
diff --git a/NEWS b/NEWS
index 24b1417..7002111 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,10 @@
 version 0.4
+* New file "sunterlib.scm" contains the old "interfaces.scm" and
+  "packages.scm" ("interfaces.scm" and "packages.scm" are deprecated
+  and will be removed in a future release).
+* New file "sunterlib-s48.scm" contains the old "s48-interfaces.scm"
+  and "s48-packages.scm" ("s48-interfaces.scm" and "s48-packages.scm"
+  are deprecated and will be removed in a future release).
 * Added display-continuation to interaction
 
 version 0.3 - 2003-4-16
diff --git a/README b/README
index 6327246..894a7b0 100644
--- a/README
+++ b/README
@@ -20,16 +20,18 @@ and the documentation is available in
 (or the corresponding subdirectories of the prefix used for
 installation).
 
-The files "interfaces.scm" and "packages.scm", are the full sunterlib
-for use with scsh.
+The file "sunterlib.scm" is the full sunterlib interface for use with
+scsh ("sunterlib.scm" is composed of the deprecated "interfaces.scm"
+and "packages.scm").
 
-The files "s48-interfaces.scm" and "s48-packages.scm", are a sunterlib
-subset for use with scheme48.
+The file "sunterlib-s48.scm" is the sunterlib subset interface for use
+with scheme48 ("sunterlib-s48.scm" is composed of the deprecated
+"s48-interfaces.scm" and "s48-packages.scm").
 
 A typical scsh script might start like this:
 
 #!/usr/local/bin/scsh \
--lm /usr/local/lib/sunterlib/interfaces.scm -lm /usr/local/lib/sunterlib/packages.scm -o foo -s
+-lm /usr/local/lib/sunterlib/sunterlib.scm -o foo -s
 !#
 
 where "foo" is a sunterlib package needed by your script.
@@ -38,4 +40,3 @@ BUGS
 
 Please use the bug tracking system to report bugs:
   http://savannah.nongnu.org/bugs/?group=sunterlib
-