comparison Makefile.in @ 112324:2b598aa5d397

Merge from mainline.
author Paul Eggert <eggert@cs.ucla.edu>
date Thu, 13 Jan 2011 09:17:33 -0800
parents ecce7818cd6f c5917804ecad
children 56d3e9c28eb0
comparison
equal deleted inserted replaced
112323:f3056cf0073a 112324:2b598aa5d397
132 # since there are now many packages documented with the texinfo 132 # since there are now many packages documented with the texinfo
133 # system, it is inappropriate to imply that it is part of Emacs. 133 # system, it is inappropriate to imply that it is part of Emacs.
134 infodir=@infodir@ 134 infodir=@infodir@
135 INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse \ 135 INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse \
136 ede ediff edt eieio efaq eintr elisp emacs emacs-mime epa erc \ 136 ede ediff edt eieio efaq eintr elisp emacs emacs-mime epa erc \
137 eshell eudc flymake forms gnus idlwave info mairix-el \ 137 ert eshell eudc flymake forms gnus idlwave info mairix-el \
138 message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc \ 138 message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc \
139 reftex remember sasl sc semantic ses sieve smtpmail speedbar \ 139 reftex remember sasl sc semantic ses sieve smtpmail speedbar \
140 tramp url vip viper widget woman 140 tramp url vip viper widget woman
141 141
142 # If no makeinfo was found and configured --without-makeinfo, "no"; else "yes". 142 # If no makeinfo was found and configured --without-makeinfo, "no"; else "yes".
265 # are not included any more in case of bootstrap or in case Emacs was 265 # are not included any more in case of bootstrap or in case Emacs was
266 # checked out from a VCS. 266 # checked out from a VCS.
267 SUBDIR = lib lib-src src lisp 267 SUBDIR = lib lib-src src lisp
268 268
269 # The subdir makefiles created by config.status. 269 # The subdir makefiles created by config.status.
270 SUBDIR_MAKEFILES = lib/Makefile lib-src/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispref/Makefile doc/lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile lisp/Makefile 270 SUBDIR_MAKEFILES = lib/Makefile lib-src/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispref/Makefile doc/lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile lisp/Makefile test/automated/Makefile
271 271
272 # Subdirectories to install, and where they'll go. 272 # Subdirectories to install, and where they'll go.
273 # lib-src's makefile knows how to install it, so we don't do that here. 273 # lib-src's makefile knows how to install it, so we don't do that here.
274 # leim's makefile also knows how to install it, so we don't do that here. 274 # leim's makefile also knows how to install it, so we don't do that here.
275 # When installing the info files, we need to do special things to 275 # When installing the info files, we need to do special things to
393 $(srcdir)/doc/lispref/Makefile.in \ 393 $(srcdir)/doc/lispref/Makefile.in \
394 $(srcdir)/doc/lispintro/Makefile.in \ 394 $(srcdir)/doc/lispintro/Makefile.in \
395 $(srcdir)/oldXMenu/Makefile.in \ 395 $(srcdir)/oldXMenu/Makefile.in \
396 $(srcdir)/lwlib/Makefile.in \ 396 $(srcdir)/lwlib/Makefile.in \
397 $(srcdir)/leim/Makefile.in \ 397 $(srcdir)/leim/Makefile.in \
398 $(srcdir)/lisp/Makefile.in 398 $(srcdir)/lisp/Makefile.in \
399 $(srcdir)/test/automated/Makefile.in
399 ./config.status 400 ./config.status
400 401
401 config.status: ${srcdir}/configure ${srcdir}/lisp/version.el 402 config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
402 ./config.status --recheck 403 ./config.status --recheck
403 404
853 # even when the build directory and source dir are different. 854 # even when the build directory and source dir are different.
854 TAGS tags: lib lib-src src 855 TAGS tags: lib lib-src src
855 cd src; $(MAKE) tags 856 cd src; $(MAKE) tags
856 857
857 check: 858 check:
858 @echo "We don't have any tests for GNU Emacs yet." 859 cd test/automated; $(MAKE) check
859 860
860 dist: 861 dist:
861 cd ${srcdir}; ./make-dist 862 cd ${srcdir}; ./make-dist
862 863
863 .PHONY: info dvi dist check html 864 .PHONY: info dvi dist check html