X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2FMakefile.in;h=df6acc9e2a4962944c84cef1092c9f0f97b2af31;hb=8bbb0ea9591624ee108c9a29da637b2d3331cf07;hp=830034b40e421fc3da24e3b1f83887249a90950d;hpb=d348bb4c87beb84f048285819da9b948dd18ab6c;p=gnus

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 830034b40..df6acc9e2 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -6,7 +6,7 @@ subdir = lisp
 top_srcdir = @top_srcdir@
 
 EMACS = @EMACS@
-FLAGS = -batch -q -no-site-file -l $(srcdir)/dgnushack.el
+FLAGS = @FLAGS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 SHELL = /bin/sh
@@ -15,22 +15,23 @@ W3DIR = @W3@
 URLDIR = @URL@
 EMACS_COMP = URLDIR=$(URLDIR) W3DIR=$(W3DIR) lispdir=$(lispdir) srcdir=$(srcdir) $(EMACS) $(FLAGS)
 
-all total: clean-some gnus-load.elc
+all total: clean-some gnus-load.el
 	$(EMACS_COMP) -f dgnushack-compile
 
 clean-some:
-	rm -f *.elc gnus-load.el
+	rm -f *.elc gnus-load.el auto-autoloads.* custom-load.*
 
-warn: clean-some gnus-load.elc
+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"
 
 # The "clever" rule is unsafe, since redefined macros are loaded from
 # .elc files, and not the .el file.
-clever some: gnus-load.elc
+clever some l: gnus-load.el
 	$(EMACS_COMP) -f dgnushack-compile
 
-install: install-el install-elc 
+install: install-el-elc list-installed-shadows
 
+# This entry will never install .el files if there are no .elc files.
 install-el: gnus-load.el
 	$(SHELL) $(top_srcdir)/mkinstalldirs $(lispdir)
 	echo " $(INSTALL_DATA) gnus-load.el $(lispdir)/gnus-load.el"
@@ -51,6 +52,27 @@ install-elc: clever
 	  $(INSTALL_DATA) $$p $(lispdir)/$$p; \
 	done
 
+install-el-elc: clever
+	rm -f dgnushack.elc
+	$(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 \
+	  q=`basename $$p c`; \
+	  if [ -f "$(srcdir)/$$q" ]; then \
+	    echo " $(INSTALL_DATA) $$q $(lispdir)/$$q"; \
+	    $(INSTALL_DATA) $(srcdir)/$$q $(lispdir)/$$q; \
+	  fi; \
+	  echo " $(INSTALL_DATA) $$p $(lispdir)/$$p"; \
+	  $(INSTALL_DATA) $$p $(lispdir)/$$p; \
+	done
+
+list-installed-shadows:
+	$(EMACS_COMP) -f dgnushack-find-lisp-shadows
+
+remove-installed-shadows:
+	$(EMACS_COMP) -f dgnushack-remove-lisp-shadows
+
 uninstall:
 	for p in *.elc; do \
 	  rm -f "$(lispdir)/$$p"; \
@@ -69,13 +91,16 @@ separately:
 pot:
 	xpot -drgnus -r`cat ./version` *.el > rgnus.pot
 
-gnus-load.el gnus-load.elc:
+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
+clean:
+	rm -f *.elc *.orig *.rej *~ auto-autoloads.* custom-load.* gnus-load.el
+
+distclean: clean
+	rm -f Makefile
 
 Makefile: $(srcdir)/Makefile.in ../config.status
 	cd .. \