X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2FMakefile.in;h=97b5cc22a5e4d4d272c14fafeec1a56078d77cb2;hp=ef4401a222316e283a28f947e9e55113317c54c5;hb=a1e20e76b6028842122275df0c5620cfd986790a;hpb=14dd9d7fe33f6c0dc44d0930845c38b810b1ee9d

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index ef4401a22..97b5cc22a 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -1,47 +1,84 @@
+prefix = @prefix@
+datarootdir = @datarootdir@
 datadir = @datadir@
 lispdir = @lispdir@
-prefix = @prefix@
 srcdir = @srcdir@
 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
 VPATH = @srcdir@
 W3DIR = @W3@
 URLDIR = @URL@
-EMACS_COMP = URLDIR=$(URLDIR) W3DIR=$(W3DIR) lispdir=$(lispdir) srcdir=$(srcdir) $(EMACS) $(FLAGS)
+EMACS_COMP = URLDIR="$(URLDIR)" W3DIR="$(W3DIR)" lispdir="$(lispdir)" srcdir=$(srcdir) $(EMACS) $(FLAGS)
 
-all total:
-	rm -f *.elc
+all total: clean-some gnus-load.el
 	$(EMACS_COMP) -f dgnushack-compile
 
-warn:
-	rm -f *.elc
+clean-some:
+	rm -f *.elc gnus-load.el auto-autoloads.* custom-load.*
+
+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:
+clever some l: gnus-load.el
 	$(EMACS_COMP) -f dgnushack-compile
 
-install: clever
+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)"
+	$(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 \
-	  echo " $(INSTALL_DATA) $$p $(lispdir)/$$p"; \
-	  $(INSTALL_DATA) $$p $(lispdir)/$$p; \
+	$(SHELL) $(top_srcdir)/mkinstalldirs "$(lispdir)"
+	@for p in *.elc; do \
+	  echo "$(INSTALL_DATA) $$p \"$(lispdir)/$$p\""; \
+	  $(INSTALL_DATA) $$p "$(lispdir)/$$p"; \
+	done
+
+install-el-elc: clever
+	rm -f dgnushack.elc
+	$(SHELL) $(top_srcdir)/mkinstalldirs "$(lispdir)"
+	$(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
 
-install-el:
-	$(SHELL) $(top_srcdir)/mkinstalldirs $(lispdir)
-	cd $(srcdir) \
-	&& for p in *.el; do \
-	  echo " $(INSTALL_DATA) $$p $(lispdir)/$$p"; \
-	  $(INSTALL_DATA) $$p $(lispdir)/$$p; \
+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"; \
+	done
+	cd $(srcdir); \
+	for p in *.el; do \
+	  rm -f "$(lispdir)/$$p"; \
 	done
 
 tags:
@@ -54,19 +91,15 @@ 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
-
-distclean:
-	rm -f *.orig *.rej *.elc *~ Makefile
+	$(EMACS_COMP) -f dgnushack-make-cus-load $(srcdir)
+	$(EMACS_COMP) -f dgnushack-make-auto-load $(srcdir)
+	$(EMACS_COMP) -f dgnushack-make-load
+
+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 .. \