Revision: xtla--xemacs--0.1--patch-4
Archive: [EMAIL PROTECTED]
Creator: Steve Youngs <[EMAIL PROTECTED]>
Date: Fri Nov 5 21:34:45 EST 2004
Standard-date: 2004-11-05 11:34:45 GMT
New-files: lisp/xtlahack.el
Modified-files: lisp/Makefile.in
New-patches: [EMAIL PROTECTED]
Summary: XEmacs build fixes
Keywords: xemacs, compile
* lisp/Makefile.in (EXTRA_OPTS): New.
(AUTOLOAD_FILE): New.
(contrib/%.elc): Use $EXTRA_OPTS.
(%.elc): Ditto.
(%-autoloads.el): Renamed to `xtla-autoloads.el'.
(xtla-autoloads.el): New.
(auto-autoloads.el): New.
* lisp/xtlahack.el: New.
This patch keeps the build systems of both GNU/Emacs & XEmacs as unified
as possible while still allowing for the differences between the two
flavours.
GNU/Emacs builds should be totally unaffected.
For XEmacs builds:
- normal "in-tree" builds are working
- "out of tree" or "VPATH" builds are working
- building individual files is working
- building auto-autoloads.el is working
* added files
lisp/xtlahack.el
{arch}/xtla/xtla--xemacs/xtla--xemacs--0.1/[EMAIL PROTECTED]
* modified files
--- orig/lisp/Makefile.in
+++ mod/lisp/Makefile.in
@@ -36,9 +36,11 @@
contrib/ewoc.el
XSRCS = auto-autoloads.el custom-load.el xtla-version.el
PACKAGEDIR = @lispdir@
+EXTRA_OPTS = -l ../@[EMAIL PROTECTED]
endif
AUTOLOAD_PACKAGE_NAME = (setq autoload-package-name \"xtla\")
+AUTOLOAD_FILE = (setq generated-autoload-file \"./auto-autoloads.el\")
BYTECOMP = -l bytecomp -f batch-byte-compile
ifeq (@HAS_TREE_WIDGET@,yes)
SRCS += xtla-browse.el
@@ -119,7 +121,7 @@
mkdir -p contrib
@echo Compiling $< for ${EMACS_FLAVOR}
@tmpdir=elc.$$$$; mkdir $$tmpdir; cp $< $$tmpdir; cd $$tmpdir ; \
- $(EMACS_PROG) -batch -q $(PUSHPATH) $(BYTECOMP) $$(basename $*.el) ; \
+ $(EMACS_PROG) -batch -q $(PUSHPATH) $(EXTRA_OPTS) $(BYTECOMP)
$$(basename $*.el) ; \
mkdir -p ../$$(dirname $*) ; \
echo mv $$(basename $@) ../$@ ; mv $$(basename $@) ../$@ ; \
cd ../ ; $(RM) -rf $$tmpdir
@@ -127,7 +129,7 @@
%.elc:
@echo "Compiling ${firstword $^} for ${EMACS_FLAVOR}"
@tmpdir=elc.$$$$; mkdir $$tmpdir; cp ${firstword $^} $$tmpdir; cd
$$tmpdir ; \
- $(EMACS_PROG) -batch -q $(PUSHPATH) $(BYTECOMP) $(@:%.elc=%.el) ; \
+ $(EMACS_PROG) -batch -q $(PUSHPATH) $(EXTRA_OPTS) $(BYTECOMP)
$(@:%.elc=%.el) ; \
mkdir -p ../$$(dirname $*) ; \
echo mv $$(basename $@) ../$@ ; mv $$(basename $@) ../$@ ; \
cd ../ ; $(RM) -rf $$tmpdir
@@ -151,7 +153,7 @@
custom-load.elc: @[EMAIL PROTECTED]
##############################################################################
-%-autoloads.el: $(SRCS:[EMAIL PROTECTED]@/%)
+xtla-autoloads.el: $(SRCS:[EMAIL PROTECTED]@/%)
-$(RM) -f $@
echo "" >> $@
(build_dir=`pwd`;
\
@@ -164,6 +166,12 @@
-f batch-update-autoloads `pwd`)
echo "(provide 'xtla-autoloads)" >> $@
+auto-autoloads.el: $(SRCS:[EMAIL PROTECTED]@/%)
+ $(EMACS_PROG) -batch \
+ -eval "$(AUTOLOAD_PACKAGE_NAME)" \
+ -eval "$(AUTOLOAD_FILE)" \
+ -l autoload -f batch-update-autoloads $^
+
##############################################################################
custom-load.el: $(SRCS:[EMAIL PROTECTED]@/%)
