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 a41b175d5856534f814f01cd05bccdd9c8483640..3f03a38ce43f363291cb5987423789b8786c9dac 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,23 +27,6 @@ include      $(top_srcdir)/vars.am
 
 SUBDIRS                         =
 
 
 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
 
 ###--------------------------------------------------------------------------
 ### Subdirectories to build
 


@@ -59,19 +42,6 @@ SUBDIRS                      += doc
 ## The tests and examples.
 SUBDIRS                        += test
 
 ## 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.
 
 ###--------------------------------------------------------------------------
 ### Distribution.
 

diff --git a/asdf-hack.lisp.in b/asdf-hack.lisp.in
deleted file mode 100644 (file)
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 9d36d6c917c5b120d0f65a454c8c3b7c95cbd989..af623572939d1c85611a8188274df787f064b982 100644 (file)
--- 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
 
 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.
 
 ###--------------------------------------------------------------------------
 ### 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 e13f15749bc57d9f07bc242daf372bfa3fa2a244..e4277742eea555f991d92f2241cb1fffc973f38f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -212,4 +212,17 @@ uninstall-local:
          rm -f $(DESTDIR)$(pkglispsrcdir)/$$i $(DESTDIR)$(lispsysdir)/$$i; \
        done
 
          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 --------------------------------------------------
 ###----- That's all, folks --------------------------------------------------

diff --git a/src/asdf-hack.lisp.in b/src/asdf-hack.lisp.in
new file mode 100644 (file)
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