X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2FMakefile.in;h=9db33b139b267f1f0e31589c21f97df07792a412;hb=deefcadcd864c43eb6dc3191339b0d5132a40cd2;hp=108c6fa3d6a4b0ac173db0dd572a04623c7ed604;hpb=93fd3c5fd9f215515162b7016beb25d30d10104b;p=elisp%2Fgnus.git-

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 108c6fa..9db33b1 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -6,22 +6,44 @@ subdir = lisp
 top_srcdir = @top_srcdir@
 
 EMACS = @EMACS@
-FLAGS = -batch -q -no-site-file -l ./dgnushack.el
+FLAGS = -batch -q -no-site-file -l $(srcdir)/dgnushack.el
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 SHELL = /bin/sh
 VPATH = @srcdir@
+W3DIR = @W3@
+URLDIR = @URL@
+EMACS_COMP = URLDIR=$(URLDIR) W3DIR=$(W3DIR) lispdir=$(lispdir) srcdir=$(srcdir) $(EMACS) $(FLAGS)
 
-all total:
-	rm -f *.elc ; $(EMACS) $(FLAGS) -f dgnushack-compile
+all total: clean-some gnus-load.el
+	$(EMACS_COMP) -f dgnushack-compile
 
-warn:
-	rm -f *.elc ; $(EMACS) $(FLAGS) --eval '(dgnushack-compile t)' 2>&1 | egrep -v "variable G|inhibit-point-motion-hooks|coding-system|temp-results|variable gnus|variable nn|scroll-in-place|deactivate-mark|filladapt-mode|byte-code-function-p|print-quoted|ps-right-header|ps-left-header|article-inhibit|print-escape|ssl-program-arguments|message-log-max"
+clean-some:
+	rm -f *.elc gnus-load.el
 
-clever some:
-	$(EMACS) $(FLAGS) -f dgnushack-compile
+warn: clean-some gnus-load.el
+	$(EMACS_COMP) --eval '(dgnushack-compile t)' 2>&1 | egrep -v "variable G|inhibit-point-motion-hooks|coding-system|temp-results|variable gnus|variable nn|scroll-in-place|deactivate-mark|filladapt-mode|byte-code-function-p|print-quoted|ps-right-header|ps-left-header|article-inhibit|print-escape|ssl-program-arguments|message-log-max"
 
-install: clever
+# The "clever" rule is unsafe, since redefined macros are loaded from
+# .elc files, and not the .el file.
+clever some l: gnus-load.el
+	$(EMACS_COMP) -f dgnushack-compile
+
+install: install-el install-elc 
+
+install-el: gnus-load.el
+	$(SHELL) $(top_srcdir)/mkinstalldirs $(lispdir)
+	echo " $(INSTALL_DATA) gnus-load.el $(lispdir)/gnus-load.el"
+	$(INSTALL_DATA) gnus-load.el $(lispdir)/gnus-load.el
+	for p in *.elc; do \
+	  p=`basename $$p c`; \
+	  if [ -f "$(srcdir)/$$p" ]; then \
+	    echo " $(INSTALL_DATA) $$p $(lispdir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/$$p $(lispdir)/$$p; \
+	  fi; \
+	done
+
+install-elc: clever
 	rm -f dgnushack.elc
 	$(SHELL) $(top_srcdir)/mkinstalldirs $(lispdir)
 	for p in *.elc; do \
@@ -29,6 +51,15 @@ install: clever
 	  $(INSTALL_DATA) $$p $(lispdir)/$$p; \
 	done
 
+uninstall:
+	for p in *.elc; do \
+	  rm -f "$(lispdir)/$$p"; \
+	done
+	cd $(srcdir); \
+	for p in *.el; do \
+	  rm -f "$(lispdir)/$$p"; \
+	done
+
 tags:
 	etags *.el
 
@@ -39,16 +70,9 @@ pot:
 	xpot -drgnus -r`cat ./version` *.el > rgnus.pot
 
 gnus-load.el:
-	echo ";;; gnus-load.el --- automatically extracted custom dependencies" > gnus-load.el
-	echo ";;" >> gnus-load.el
-	echo ";;; Code:" >> gnus-load.el
-	echo >> gnus-load.el
-	$(EMACS)  $(FLAGS) -l ./dgnushack.el -l cus-edit.el *.el \
-		-f custom-make-dependencies >> gnus-load.el
-	echo >> gnus-load.el
-	echo "(provide 'gnus-load)" >> gnus-load.el
-	echo >> gnus-load.el
-	echo ";;; gnus-load.el ends here" >> gnus-load.el
+	$(EMACS_COMP) -f dgnushack-make-cus-load $(srcdir)
+	$(EMACS_COMP) -f dgnushack-make-auto-load $(srcdir)
+	$(EMACS_COMP) -f dgnushack-make-load
 
 distclean:
 	rm -f *.orig *.rej *.elc *~ Makefile