X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2FMakefile.in;h=a64531543cf73fff2f19cf5b5554c204e71d582b;hb=873ba7b51ddfb07246cd874b7de72662308236c9;hp=59bac8d84afcf18e64a2d9ce85be766297a52865;hpb=dbdf9c97e898832234c7acac88e226b246db7894;p=gnus

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 59bac8d84..a64531543 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -1,63 +1,96 @@
+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: 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"
 
+fail-on-warning: clean-some gnus-load.el
+	$(EMACS_COMP) -f dgnushack-compile-error-on-warn
+
 # 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
 
-install-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 \
+# Test rules
+check:	test-registry test-nntp
+
+test-registry:
+	$(EMACS) $(FLAGS) -l ert -l gnus-registry.el -f ert-run-tests-batch-and-exit
+
+test-nntp:
+	$(EMACS) $(FLAGS) -l ert -l tests/gnustest-nntp.el -f ert-run-tests-batch-and-exit
+
+# This entry will never install .el files if there are no .elc files.
+install-el: gnus-load.el
+	$(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(lispdir)"
+	$(INSTALL_DATA) gnus-load.el "$(DESTDIR)$(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; \
+	    echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(lispdir)/$$p\""; \
+	    $(INSTALL_DATA) $(srcdir)/$$p "$(DESTDIR)$(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 "$(DESTDIR)$(lispdir)"
+	@for p in *.elc; do \
+	  echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(lispdir)/$$p\""; \
+	  $(INSTALL_DATA) $$p "$(DESTDIR)$(lispdir)/$$p"; \
 	done
 
+install-el-elc: clever
+	rm -f dgnushack.elc
+	$(SHELL) $(top_srcdir)/mkinstalldirs "$(DESTDIR)$(lispdir)"
+	$(INSTALL_DATA) gnus-load.el "$(DESTDIR)$(lispdir)/gnus-load.el"
+	@for p in *.elc; do \
+	  q=`basename $$p c`; \
+	  if [ -f "$(srcdir)/$$q" ]; then \
+	    echo "$(INSTALL_DATA) $$q \"$(DESTDIR)$(lispdir)/$$q\""; \
+	    $(INSTALL_DATA) $(srcdir)/$$q "$(DESTDIR)$(lispdir)/$$q"; \
+	  fi; \
+	  echo "$(INSTALL_DATA) $$p \"$(DESTDIR)$(lispdir)/$$p\""; \
+	  $(INSTALL_DATA) $$p "$(DESTDIR)$(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"; \
+	  rm -f "$(DESTDIR)$(lispdir)/$$p"; \
 	done
 	cd $(srcdir); \
 	for p in *.el; do \
-	  rm -f "$(lispdir)/$$p"; \
+	  rm -f "$(DESTDIR)$(lispdir)/$$p"; \
 	done
 
 tags:
@@ -69,13 +102,16 @@ separately:
 pot:
 	xpot -drgnus -r`cat ./version` *.el > rgnus.pot
 
-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 .. \