From 88005ae9e51d97c30485739bef5f1ef0f32aac5c Mon Sep 17 00:00:00 2001
Message-Id: <88005ae9e51d97c30485739bef5f1ef0f32aac5c.1716702056.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Wed, 21 Aug 2019 14:41:27 +0100
Subject: [PATCH] Reorganize some of the more random files.
Organization: Straylight/Edgeware

From: Mark Wooding <mdw@distorted.org.uk>

  * Move `sod.m4' and `sod.pc' into `lib/', because they're concerned
    with the C library.

  * Move `asdf-hack.lisp' and `emacs-hacks.el' into `src/', because
    they're concerned with Lisp.
---
 Makefile.am                          | 30 ----------------------------
 asdf-hack.lisp.in                    |  6 ------
 lib/Makefile.am                      | 17 ++++++++++++++++
 sod.m4 => lib/sod.m4                 |  0
 sod.pc.in => lib/sod.pc.in           |  0
 src/Makefile.am                      | 13 ++++++++++++
 src/asdf-hack.lisp.in                |  5 +++++
 emacs-hacks.el => src/emacs-hacks.el |  0
 8 files changed, 35 insertions(+), 36 deletions(-)
 delete mode 100644 asdf-hack.lisp.in
 rename sod.m4 => lib/sod.m4 (100%)
 rename sod.pc.in => lib/sod.pc.in (100%)
 create mode 100644 src/asdf-hack.lisp.in
 rename emacs-hacks.el => src/emacs-hacks.el (100%)

diff --git a/Makefile.am b/Makefile.am
index a41b175..3f03a38 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,23 +27,6 @@ include	$(top_srcdir)/vars.am
 
 SUBDIRS			 =
 
-###--------------------------------------------------------------------------
-### Package-configuration file.
-
-pkgconfigdir		 = $(libdir)/pkgconfig
-pkgconfig_DATA		 = sod.pc
-CLEANFILES		+= sod.pc
-EXTRA_DIST		+= sod.pc.in
-
-sod.pc: sod.pc.in Makefile
-	$(SUBST) $(srcdir)/sod.pc.in >$@.new $(SUBSTITUTIONS) && mv $@.new $@
-
-###--------------------------------------------------------------------------
-### Autoconf machinery.
-
-aclocaldir		 = $(datadir)/aclocal
-dist_aclocal_DATA	 = sod.m4
-
 ###--------------------------------------------------------------------------
 ### Subdirectories to build
 
@@ -59,19 +42,6 @@ SUBDIRS			+= doc
 ## The tests and examples.
 SUBDIRS			+= test
 
-###--------------------------------------------------------------------------
-### Additional random things useful during development.
-
-## ASDF hacking for finding the system definitions.
-EXTRA_DIST		+= asdf-hack.lisp.in
-noinst_DATA		+= asdf-hack.lisp
-asdf-hack.lisp: asdf-hack.lisp.in Makefile
-	$(SUBST) $(srcdir)/asdf-hack.lisp.in >$@.new $(SUBSTITUTIONS) && \
-		mv $@.new $@
-
-## Emacs hacking for indentation.
-EXTRA_DIST		+= emacs-hacks.el
-
 ###--------------------------------------------------------------------------
 ### Distribution.
 
diff --git a/asdf-hack.lisp.in b/asdf-hack.lisp.in
deleted file mode 100644
index 90125c2..0000000
--- a/asdf-hack.lisp.in
+++ /dev/null
@@ -1,6 +0,0 @@
-;; -*-lisp-*-
-
-(declaim (optimize debug))
-(asdf:initialize-source-registry
- `(:source-registry :inherit-configuration
-		    (:directory (,*load-pathname* "src"))))
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9d36d6c..af62357 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -59,6 +59,23 @@ BUILT_SOURCES		+= $(nodist_libsod_la_SOURCES) \
 sod-base.c: $(SOD); $(V_SOD_c)$(SOD) -tc --builtin
 sod-base.h: $(SOD); $(V_SOD_h)$(SOD) -th --builtin
 
+###--------------------------------------------------------------------------
+### Package-configuration file.
+
+pkgconfigdir		 = $(libdir)/pkgconfig
+pkgconfig_DATA		 = sod.pc
+CLEANFILES		+= sod.pc
+EXTRA_DIST		+= sod.pc.in
+
+sod.pc: sod.pc.in Makefile
+	$(SUBST) $(srcdir)/sod.pc.in >$@.new $(SUBSTITUTIONS) && mv $@.new $@
+
+###--------------------------------------------------------------------------
+### Autoconf machinery.
+
+aclocaldir		 = $(datadir)/aclocal
+dist_aclocal_DATA	 = sod.m4
+
 ###--------------------------------------------------------------------------
 ### Other manual pages.
 
diff --git a/sod.m4 b/lib/sod.m4
similarity index 100%
rename from sod.m4
rename to lib/sod.m4
diff --git a/sod.pc.in b/lib/sod.pc.in
similarity index 100%
rename from sod.pc.in
rename to lib/sod.pc.in
diff --git a/src/Makefile.am b/src/Makefile.am
index e13f157..e427774 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -212,4 +212,17 @@ uninstall-local:
 	  rm -f $(DESTDIR)$(pkglispsrcdir)/$$i $(DESTDIR)$(lispsysdir)/$$i; \
 	done
 
+###--------------------------------------------------------------------------
+### Additional random things useful during development.
+
+## ASDF hacking for finding the system definitions.
+EXTRA_DIST		+= asdf-hack.lisp.in
+noinst_DATA		+= asdf-hack.lisp
+asdf-hack.lisp: asdf-hack.lisp.in Makefile
+	$(SUBST) $(srcdir)/asdf-hack.lisp.in >$@.new $(SUBSTITUTIONS) && \
+		mv $@.new $@
+
+## Emacs hacking for indentation.
+EXTRA_DIST		+= emacs-hacks.el
+
 ###----- That's all, folks --------------------------------------------------
diff --git a/src/asdf-hack.lisp.in b/src/asdf-hack.lisp.in
new file mode 100644
index 0000000..a09db8b
--- /dev/null
+++ b/src/asdf-hack.lisp.in
@@ -0,0 +1,5 @@
+;; -*-lisp-*-
+
+(declaim (optimize debug))
+(asdf:initialize-source-registry
+ `(:source-registry :inherit-configuration (:directory ,*load-pathname*)))
diff --git a/emacs-hacks.el b/src/emacs-hacks.el
similarity index 100%
rename from emacs-hacks.el
rename to src/emacs-hacks.el
-- 
[mdw]