From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 21 Aug 2019 13:41:27 +0000 (+0100)
Subject: Reorganize some of the more random files.
X-Git-Url: https://git.distorted.org.uk/~mdw/sod/commitdiff_plain/88005ae9e51d97c30485739bef5f1ef0f32aac5c?hp=d504247bf7aedf80858a04b7c86be194390f4fd9

Reorganize some of the more random files.

  * 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.
---

diff --git a/Makefile.am b/Makefile.am
index a41b175..3f03a38 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,23 +28,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
 
 ## The SOD translator.
@@ -60,19 +43,6 @@ SUBDIRS			+= doc
 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.
 
 ## Release number.
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
@@ -60,6 +60,23 @@ 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.
 
 dist_man_MANS		+= sod-structs.3
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