From 4d757a73564a3603aab35998722578307f306f9f Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 4 Aug 2019 13:54:24 +0100
Subject: [PATCH] src/: Use the `optparse' package in `sod-user'.

This involves moving the `optparse' build into the main `sod' system.
---
 doc/list-exports.lisp   | 4 ++--
 src/package.lisp        | 1 +
 src/sod-frontend.asd.in | 3 +--
 src/sod.asd.in          | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/list-exports.lisp b/doc/list-exports.lisp
index f58fb2b..8ef80b8 100755
--- a/doc/list-exports.lisp
+++ b/doc/list-exports.lisp
@@ -462,9 +462,9 @@
 	 (parser-files (files (by-name sod "parser")))
 	 (utilities (by-name sod "utilities"))
 	 (sod-frontend (asdf:find-system "sod-frontend"))
-	 (optparse (by-name sod-frontend "optparse"))
+	 (optparse (by-name sod "optparse"))
 	 (frontend (by-name sod-frontend "frontend"))
-	 (sod-files (set-difference (files sod) (list utilities))))
+	 (sod-files (set-difference (files sod) (list optparse utilities))))
     (report-symbols (mapcar #'file-name sod-files) "SOD")
     (report-symbols (mapcar #'file-name (list frontend)) "SOD-FRONTEND")
     (report-symbols (mapcar #'file-name parser-files) "SOD-PARSER")
diff --git a/src/package.lisp b/src/package.lisp
index 9f0179a..13466c8 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -31,6 +31,7 @@
 (cl:defpackage #:sod-user
   (:use #:common-lisp
 	#:sod-utilities
+	#:optparse
 	#:sod-parser
 	#:sod))
 
diff --git a/src/sod-frontend.asd.in b/src/sod-frontend.asd.in
index 7c7a92c..d508bae 100644
--- a/src/sod-frontend.asd.in
+++ b/src/sod-frontend.asd.in
@@ -56,7 +56,6 @@
   :depends-on ("cl-launch" "sod")
 
   :components
-  ((:file "optparse")
-   (:file "frontend" :depends-on ("optparse"))))
+  ((:file "frontend")))
 
 ;;;----- That's all, folks --------------------------------------------------
diff --git a/src/sod.asd.in b/src/sod.asd.in
index 0755979..eabc504 100644
--- a/src/sod.asd.in
+++ b/src/sod.asd.in
@@ -69,6 +69,7 @@
 
   :components
   ((:file "utilities")
+   (:file "optparse")
 
    ;; Parser equipment.  This is way more elaborate than it needs to be, but
    ;; it was interesting, and it may well get split off into a separate
-- 
2.11.0