Clean up package.

There's only one package now. Other packages that want to use
lui, tracking, lcs, etc. should depend on Circe directly.

.gitignore

@@ -1,4 +1,4 @@
-/build
+/dist
 /release
 *.elc
 .cask

Makefile

@@ -1,48 +1,19 @@
-.PHONY: all test tar circe lui tracking lcs shorten
+.PHONY: all test release clean
 
 VERSION=$(shell sed -ne 's/^;; Version: \(.*\)/\1/p' lisp/circe.el)
 
 all: test
 
 test:
-	cask exec ert-runner -L lisp -L test -L ../emacs-buttercup -l test/*-test.el
-	cask exec emacs -batch -L lisp -L test -L ../emacs-buttercup -l buttercup.el -f buttercup-run-discover
+	cask exec ert-runner -L .
+	cask exec buttercup -L .
 
-tar: clean circe lui tracking lcs shorten
-
-circe:
-	mkdir -p "build/circe-$(VERSION)"
-	cp lisp/circe*.el "build/circe-$(VERSION)/"
-	cat "build/circe-$(VERSION)/circe.el" \
-	  | sed -e '1,/^;;;.*Commentary:.*/d' \
-	        -e '/^;;; Code:/,$$d' \
-	  | sed -e '1d' -e '$$d' \
-	        -e 's/^;* *//' \
-          > "build/circe-$(VERSION)/README"
-	tar -C "build" -c "circe-$(VERSION)" > "build/circe-$(VERSION).tar"
-	rm -rf "build/circe-$(VERSION)"
-
-lui:
-	mkdir -p "build/lui-$(VERSION)"
-	cp lisp/lui*.el "build/lui-$(VERSION)/"
-	cat "build/lui-$(VERSION)/lui.el" \
-	  | sed -e '1,/^;;;.*Commentary:.*/d' \
-	        -e '/^;;; Code:/,$$d' \
-	  | sed -e '1d' -e '$$d' \
-	        -e 's/^;* *//' \
-          > "build/lui-$(VERSION)/README"
-	tar -C "build" -c "lui-$(VERSION)" > "build/lui-$(VERSION).tar"
-	rm -rf "build/lui-$(VERSION)"
-
-tracking:
-	cp "lisp/tracking.el" "build/tracking-$(VERSION).el"
-
-lcs:
-	cp "lisp/lcs.el" "build/lcs-$(VERSION).el"
-
-shorten:
-	cp "lisp/shorten.el" "build/shorten-$(VERSION).el"
+release: clean test
+	mkdir -p "dist/circe-$(VERSION)"
+	cp lisp/*.el "dist/circe-$(VERSION)/"
+	tar -C "dist" -c "circe-$(VERSION)" > "dist/circe-$(VERSION).tar"
+	rm -rf "dist/circe-$(VERSION)"
 
 clean:
-	rm -rf build
+	rm -rf dist
 	find -name '*.elc' -delete

circe-pkg.el

@@ -0,0 +1 @@
+(define-package "circe" "1.6" "Client for IRC in Emacs")

lisp/circe.el → circe.el

@@ -22,20 +22,6 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; Commentary:
-
-;; Circe is a Client for IRC in Emacs. It integrates well with the rest
-;; of the editor, using standard Emacs key bindings and indicating
-;; activity in channels in the status bar so it stays out of your way
-;; unless you want to use it.
-
-;; Complexity-wise, it is somewhere between rcirc (very minimal) and ERC
-;; (very complex).
-
-;; Once installed, you should be able to simply use M-x circe to
-;; connect to IRC. See the wiki on the project homepage for a more
-;; elaboration configuration options.
-
 ;;; Code:
 
 (defvar circe-version "1.6"