emacs-jabber jabber.el, 1.85, 1.86 configure.ac, 1.2, 1.3 Makefile.am, 1.2, 1.3

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv7675

Modified Files:
	jabber.el configure.ac Makefile.am 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-484
Creator:  Magnus Henoch <ma...@fr...>

Rename jabber-autoload to jabber-autoloads.  Add elpa target.


Index: configure.ac
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- configure.ac	20 Apr 2008 11:44:07 -0000	1.2
+++ configure.ac	24 Apr 2008 02:19:18 -0000	1.3
@@ -11,5 +11,5 @@
 AM_CONDITIONAL([USE_OUR_SHA1], [test x$HAVE_SHA1 = xno -a x$HAVE_SHA1_EL = xno])
 AM_CONDITIONAL([USE_OUR_HEX_UTIL], [test x$HAVE_HEX_UTIL = xno])
 
-AC_CONFIG_FILES([Makefile tests/Makefile])
+AC_CONFIG_FILES([Makefile tests/Makefile jabber-pkg.el])
 AC_OUTPUT

Index: Makefile.am
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	20 Apr 2008 11:44:07 -0000	1.2
+++ Makefile.am	24 Apr 2008 02:19:18 -0000	1.3
@@ -27,15 +27,17 @@
 compat_lisp_sources += compat/hex-util.el
 endif
 
-dist_lisp_LISP=$(my_lisp_sources) $(compat_lisp_sources) jabber-autoload.el
-MAINTAINERCLEANFILES=jabber-autoload.el
+dist_lisp_LISP=$(my_lisp_sources) $(compat_lisp_sources) jabber-autoloads.el
+MAINTAINERCLEANFILES=jabber-autoloads.el
+
+EXTRA_DIST = jabber-pkg.el
 
 # The autoload file will cause Lisp sources to be rebuilt _twice_: the
 # timestamp of the Lisp compilation is set _before_ the autoloads are
 # regenerated, which means that jabber-autoload.el is once again
 # considered new, which means that everything will be built again.
 # Suggestions welcome.
-jabber-autoload.el: $(my_lisp_sources)
+jabber-autoloads.el: $(my_lisp_sources)
 	$(EMACS) --batch --eval "(setq generated-autoload-file \"$(abs_builddir)/$@\")" -f batch-update-autoloads $(srcdir)
 
 info_TEXINFOS=jabber.texi
@@ -44,3 +46,13 @@
 
 SUBDIRS = . tests
 
+# Package everything in a form suitable for ELPA.  That is, use
+# "jabber" instead of "emacs-jabber" as base name.
+elpa: dist
+	rm -rf emacs-jabber-$(PACKAGE_VERSION) jabber-$(PACKAGE_VERSION)
+	$(AMTAR) xzf emacs-jabber-$(PACKAGE_VERSION).tar.gz
+	mv emacs-jabber-$(PACKAGE_VERSION) jabber-$(PACKAGE_VERSION)
+	cd jabber-$(PACKAGE_VERSION) ; install-info jabber.info dir
+	$(AMTAR) chf jabber-$(PACKAGE_VERSION).tar jabber-$(PACKAGE_VERSION)
+	rm -rf jabber-$(PACKAGE_VERSION)
+	@echo "Created jabber-$(PACKAGE_VERSION).tar"

Index: jabber.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber.el,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- jabber.el	23 Apr 2008 12:10:33 -0000	1.85
+++ jabber.el	24 Apr 2008 02:19:18 -0000	1.86
@@ -152,7 +152,7 @@
 (require 'jabber-wmii)
 (require 'jabber-osd)
 
-(load "jabber-autoload")
+(load "jabber-autoloads")
 
 
 (defvar *jabber-current-status* nil