Spring cleaning.

Overhaul for newer Autotools, and swapping in and out some skeletons.

  * We have new skeletons for C# and .ac files (e.g., configure.ac).

  * We've lost skeletons for .mxd (never implemented the reader), .gc
    and .wml.

diff --git a/Makefile.am b/Makefile.am
index 60804640212da2327546ba57dc75e4a9a73ffba0..e0e7c75a29db3e9618c43cf0f2364a89b1748ec1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,61 +1,83 @@
-## -*-makefile-*-
-##
-## $Id$
-##
-## Makefile for skel
-##
-## (c) 1998 Mark Wooding
-##
-
-##----- Licensing notice ----------------------------------------------------
-##
-## This file is part of Skel.
-##
-## Skel is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## Skel is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Skel; if not, write to the Free Software Foundation,
-## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-## --- Basic automake configuration ---
-
-AUTOMAKE_OPTIONS = foreign
-
-## --- Emacs lisp files to build ---
+### -*-makefile-*-
+###
+### Makefile for skel
+###
+### (c) 1998 Mark Wooding
+###
+
+###----- Licensing notice ---------------------------------------------------
+###
+### This file is part of Skel.
+###
+### Skel is free software; you can redistribute it and/or modify
+### it under the terms of the GNU General Public License as published by
+### the Free Software Foundation; either version 2 of the License, or
+### (at your option) any later version.
+###
+### Skel is distributed in the hope that it will be useful,
+### but WITHOUT ANY WARRANTY; without even the implied warranty of
+### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+### GNU General Public License for more details.
+###
+### You should have received a copy of the GNU General Public License
+### along with Skel; if not, write to the Free Software Foundation,
+### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+###--------------------------------------------------------------------------
+### Emacs Lisp stuff.
 
 lisp_LISP = skel.el skel-init.el
 ELCFILES = skel.elc
 
-## --- Other things to install ---
-
-pkgdata_DATA = \
-       skeleton skelrc \
-       skelrc.c skelrc.cc skelrc.h skelrc.m skelrc.y skelrc.java \
-       skelrc.mxd \
-       skelrc.el \
-       skelrc.lisp \
-       skelrc.pm skelrc.pl skelrc.py skelrc.pyx \
-       skelrc.am skelrc.in \
-       skelrc.wml \
-       skelrc.hs skelrc.gc \
-       skeleton.skel skelrc.skel \
-       skeleton.texi skelrc.texi
-
-## --- Things to distribute ---
-
-EXTRA_DIST = \
-       $(pkgdata_DATA) \
-       skel-init.el \
+###--------------------------------------------------------------------------
+### Skeleton files for various languages.
+
+SKEL_FILES = skeleton skelrc
+
+## C and related languages
+SKEL_FILES += skelrc.c skelrc.h 
+SKEL_FILES += skelrc.cc
+SKEL_FILES += skelrc.m
+SKEL_FILES += skelrc.cs
+SKEL_FILES += skelrc.java
+
+## Lisp
+SKEL_FILES += skelrc.lisp skelrc.el
+
+## Python
+SKEL_FILES += skelrc.py skelrc.pyx
+
+## Perl
+SKEL_FILES += skelrc.pl skelrc.pm
+
+## Autotools
+SKEL_FILES += skelrc.am skelrc.ac
+
+## Haskell
+SKEL_FILES += skelrc.hs
+
+## Skeleton files
+SKEL_FILES += skeleton.skel skelrc.skel
+
+## Texinfo
+SKEL_FILES += skeleton.texi skelrc.texi
+
+###--------------------------------------------------------------------------
+### What goes where.
+
+pkgdata_DATA = $(SKEL_FILES)
+
+###--------------------------------------------------------------------------
+### Distribution.
+
+EXTRA_DIST = $(SKEL_FILES) skel-init.el
+
+###--------------------------------------------------------------------------
+### Debian.
+
+EXTRA_DIST += \
        debian/control debian/copyright debian/changelog debian/rules \
        debian/skel.emacsen-install debian/skel.emacsen-remove \
        debian/skel.emacsen-startup
 
-##----- That's all, folks ---------------------------------------------------
+###----- That's all, folks --------------------------------------------------

diff --git a/configure.in b/configure.ac
similarity index 82%
rename from configure.in
rename to configure.ac
index cbf3d6752e5b807aca20cbc92803a6c4591326b1..6552ea9ef9dcd1cdb64454337ff2e6b6c9b7e69d 100644 (file)
--- a/configure.in
+++ b/configure.ac
@@ -1,6 +1,4 @@
-dnl -*-m4-*-
-dnl
-dnl $Id: configure.in,v 1.8 2004/04/08 01:36:28 mdw Exp $
+dnl -*-autoconf-*-
 dnl
 dnl Configuration script for skel
 dnl
@@ -25,15 +23,19 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with Skel; if not, write to the Free Software Foundation,
 dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-AC_INIT(skel.el.in)
-AM_INIT_AUTOMAKE(skel, 1.1.0)
+mdw_AUTO_VERSION
+AC_INIT([Skel], AUTO_VERSION, [mdw@distorted.org.uk])
+AC_CONFIG_SRCDIR([skel.el.in])
+AM_INIT_AUTOMAKE([foreign])
+
 AM_PATH_LISPDIR
 
 mdw_DEFINE_PATHS([
   skeldir=mdw_PATH([$datadir/$PACKAGE])
 ])
-AC_SUBST(skeldir)
+AC_SUBST([skeldir])
 
-AC_OUTPUT(Makefile skel.el)
+AC_CONFIG_FILES([Makefile skel.el])
+AC_OUTPUT
 
 dnl ----- That's all, folks -------------------------------------------------

diff --git a/setup b/setup
deleted file mode 100755 (executable)
index 8dbf410..0000000
--- a/setup
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/sh
-
-set -e
-mklinks
-mkaclocal
-autoconf
-automake -a
-mkdir -p build

diff --git a/skel-init.el b/skel-init.el
index 82a018e6547889b16dd727453bb04862c1ec8e83..ca014bf29e586b71b03a9720fd7da44b380a1967 100644 (file)
--- a/skel-init.el
+++ b/skel-init.el
@@ -1,7 +1,5 @@
 ;;; -*-emacs-lisp-*-
 ;;;
-;;; $Id: skel-init.el,v 1.2 1999/05/13 22:59:07 mdw Exp $
-;;;
 ;;; Initialize skeleton stuff
 ;;;
 ;;; (c) 1998 Mark Wooding

diff --git a/skel.el.in b/skel.el.in
index 8b6e965b81d31e70ca9e7e0f6c186a9e0a8f93a8..b56afe0cd82ebd65c2408627b59f42c3b1d76914 100644 (file)
--- a/skel.el.in
+++ b/skel.el.in
@@ -1,7 +1,5 @@
 ;;; -*-emacs-lisp-*-
 ;;;
-;;; $Id: skel.el.in,v 1.5 2004/04/08 01:36:28 mdw Exp $
-;;;
 ;;; Filling in skeletons
 ;;;
 ;;; (c) 1998 Mark Wooding
@@ -200,7 +198,7 @@
 
     (funcall switch (find-file-noselect name))
     (kill-region (point-min) (point-max))
-    (insert-file skel)
+    (insert-file-contents skel)
 
     ;; --- Mangle the skeleton data in the file ---
 

diff --git a/skelrc.in b/skelrc.ac
similarity index 86%
rename from skelrc.in
rename to skelrc.ac
index d1f7bb6a9d4eaed526c7118f1b39a9e69fa86092..ce3b4114d60f65b6fb316e9c12c0892d60faef1d 100644 (file)
--- a/skelrc.in
+++ b/skelrc.ac
@@ -1,7 +1,5 @@
 ;; -*-emacs-lisp-*-
 
-(skelrc-force-mode 'fundamental-mode)
-
 (setq skel-alist
       (append
        '((new-comment . "dnl")

diff --git a/skelrc.am b/skelrc.am
index 1047b25a82e4c44ce20af1ca1c5da87864b65f61..e017d5af5e7345f7d95822d66e0b612bb85ea4f1 100644 (file)
--- a/skelrc.am
+++ b/skelrc.am
@@ -4,10 +4,10 @@
 
 (setq skel-alist
       (append
-       '((new-comment . "##")
-        (cont-comment . "##")
-        (end-comment . "##")
-        (block-start . "##")
+       '((new-comment . "###")
+        (cont-comment . "###")
+        (end-comment . "###")
+        (block-start . "###")
         (block-banner-knob . "")
         (block-banner-end . "")
         (block-end . ""))

diff --git a/skelrc.cs b/skelrc.cs
new file mode 100644 (file)
index 0000000..a4f96e1
--- /dev/null
+++ b/skelrc.cs
@@ -0,0 +1,9 @@
+;;; -*-emacs-lisp-*-
+
+(skelrc-force-mode 'csharp-mode)
+(skel-include "skelrc.c")
+(setq skel-alist
+      (append
+       '((includes-banner . (skelrc-banner "Imports"))
+        (preamble . "[[includes]][[main-code]]"))
+       skel-alist))

diff --git a/skelrc.el b/skelrc.el
index b686c05a0d2edbcba7625aab516659de2337481f..e2883ace27061e927a5951bf6e1075e6e5abbab6 100644 (file)
--- a/skelrc.el
+++ b/skelrc.el
@@ -1,10 +1,4 @@
 ;;; -*-emacs-lisp-*-
 
 (skelrc-force-mode 'emacs-lisp-mode)
-
-(setq skel-alist
-      (append
-       '((new-comment . ";;;")
-        (cont-comment . ";;;")
-        (end-comment . ";;;"))
-       skel-alist))
+(skel-include "skelrc.lisp")

diff --git a/skelrc.gc b/skelrc.gc
deleted file mode 100644 (file)
index 756f79d..0000000
--- a/skelrc.gc
+++ /dev/null
@@ -1,15 +0,0 @@
-;;; -*-emacs-lisp-*-
-
-(skelrc-force-mode 'haskell-mode)
-
-(setq skel-alist
-      (append
-       '((new-comment . "--")
-        (cont-comment . "--")
-        (end-comment . "--")
-        (block-start . "--")
-        (block-banner-knob . "")
-        (block-banner-end . "")
-        (block-end . "")
-        (preamble . ""))
-       skel-alist))

diff --git a/skelrc.java b/skelrc.java
index ff72fab81a3f73b5f474b753d304865b7321fce0..637265e39ed6edf792f50e43f57677bca9714129 100644 (file)
--- a/skelrc.java
+++ b/skelrc.java
@@ -1,9 +1,4 @@
 ;;; -*-emacs-lisp-*-
 
 (skelrc-force-mode 'java-mode)
-(skel-include "skelrc.c")
-(setq skel-alist
-      (append
-       '((includes-banner . (skelrc-banner "Imports"))
-        (preamble . "[[includes]][[main-code]]"))
-       skel-alist))
+(skel-include "skelrc.cs")

diff --git a/skelrc.mxd b/skelrc.mxd
deleted file mode 100644 (file)
index e1d7816..0000000
--- a/skelrc.mxd
+++ /dev/null
@@ -1,23 +0,0 @@
-;;; -*-emacs-lisp-*-
-
-(skel-include "skelrc.c")
-
-(defun skelrc-mxd-header ()
-  (if buffer-file-name
-      (file-name-sans-extension (file-name-nondirectory buffer-file-name)))
-    (skel-lookup 'mxd-header-name))
-
-(setq skel-alist
-      (append
-       '((preamble . "[[prologue]][[includes]][[structures]]")
-        (prologue . "@mxd prologue \"[[header-name]].h\";\n\n")
-        (header-name . (skelrc-mxd-header))
-        (c++-guard . "#ifdef __cplusplus\n  extern \"C\" {\n#endif\n\n")
-        (includes . "[[includes-banner]]\n\n[[headers]]")
-        (includes-banner . (skelrc-banner "Header files"))
-        (headers . "")
-        (structures . "[[struct-banner]]\n\n@mxd {\n\n}\n\n")
-        (struct-banner . (skelrc-banner "Data structures"))
-        (postamble . "[[epilogue]]\n")
-        (epilogue . "\n@mxd epilogue;"))
-       skel-alist))

diff --git a/skelrc.py b/skelrc.py
index eaba5a6016f994363b275438095f94576a2e555c..07ba7851d2666c386d965adf67ecbe281d74a7d1 100644 (file)
--- a/skelrc.py
+++ b/skelrc.py
@@ -4,10 +4,10 @@
 
 (setq skel-alist
       (append
-       '((new-comment . "#")
-        (cont-comment . "#")
-        (end-comment . "#")
-        (block-start . "#")
+       '((new-comment . "###")
+        (cont-comment . "###")
+        (end-comment . "###")
+        (block-start . "###")
         (block-banner-knob . "")
         (block-banner-end . "")
         (block-end . "")

diff --git a/skelrc.pyx b/skelrc.pyx
index c56aec0a2830c8b18d0fa696ded1db9c4f24e76f..194299effe411432820121fbe3dcb89727712567 100644 (file)
--- a/skelrc.pyx
+++ b/skelrc.pyx
@@ -1,15 +1,4 @@
 ;;; -*-emacs-lisp-*-
 
 (skelrc-force-mode 'pyrex-mode)
-
-(setq skel-alist
-      (append
-       '((new-comment . "#")
-        (cont-comment . "#")
-        (end-comment . "#")
-        (block-start . "#")
-        (block-banner-knob . "")
-        (block-banner-end . "")
-        (block-end . "")
-        (preamble . ""))
-       skel-alist))
+(skel-include "skelrc.py")

diff --git a/skelrc.wml b/skelrc.wml
deleted file mode 100644 (file)
index 0be2bc7..0000000
--- a/skelrc.wml
+++ /dev/null
@@ -1,23 +0,0 @@
-;;; -*-emacs-lisp-*-
-
-(skelrc-force-mode 'sgml-html-mode)
-
-(setq skel-alist
-      (append
-       '((new-comment . "#")
-        (cont-comment . "#")
-        (end-comment . "#")
-        (block-start . "#")
-        (emacs-mode . "sgml-html")
-        (block-banner-knob . "")
-        (block-banner-end . "")
-        (block-end . "")
-        (preamble . "[[includes]][[definitions]][[body-text]]")
-        (includes . "[[includes-banner]]\n[[stdincludes]]\n")
-        (includes-banner . (skelrc-banner "Includes"))
-        (stdincludes . "")
-        (definitions . "[[defs-banner]]\n\n")
-        (defs-banner . (skelrc-banner "Definitions"))
-        (body-text . "[[body-banner]]\n\n")
-        (body-banner . (skelrc-banner "Body text")))
-       skel-alist))