comparison Makefile.in @ 84331:69a5b7649f84

(mansrcdir): New variable. (SUBDIR_MAKEFILES): Update for new doc/ directory layout. (man/Makefile, lispref/Makefile, lispintro/Makefile): Rename and update these targets for new doc/ directory layout. (doc/misc/Makefile): New target. (install-arch-indep): Use mansrcdir for new location of manpages. (mostlyclean, clean, distclean, maintainer-clean, unlock) (relock, info, dvi): Update targets for new doc/ directory layout.
author Glenn Morris <rgm@gnu.org>
date Thu, 06 Sep 2007 05:11:36 +0000
parents 9cbc38ee05d2
children 65bff746a07a
comparison
equal deleted inserted replaced
84330:6c9d7b3b34e8 84331:69a5b7649f84
156 # set by the configure script's `--srcdir' option. 156 # set by the configure script's `--srcdir' option.
157 157
158 # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH. 158 # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
159 srcdir=@srcdir@ 159 srcdir=@srcdir@
160 160
161 # Where the manpage source files are kept.
162 mansrcdir=$(srcdir)/doc/man
163
161 # Tell make where to find source files; this is needed for the makefiles. 164 # Tell make where to find source files; this is needed for the makefiles.
162 VPATH=@srcdir@ 165 VPATH=@srcdir@
163 166
164 # Where to find the application default. 167 # Where to find the application default.
165 x_default_search_path=@x_default_search_path@ 168 x_default_search_path=@x_default_search_path@
248 # because the compiled lisp files are part of the distribution. 251 # because the compiled lisp files are part of the distribution.
249 # leim is not included because it needs special handling. 252 # leim is not included because it needs special handling.
250 SUBDIR = lib-src src 253 SUBDIR = lib-src src
251 254
252 # The makefiles of the directories in $SUBDIR. 255 # The makefiles of the directories in $SUBDIR.
253 SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile lispref/Makefile lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile 256 SUBDIR_MAKEFILES = lib-src/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispref/Makefile doc/lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile
254 257
255 # Subdirectories to install, and where they'll go. 258 # Subdirectories to install, and where they'll go.
256 # lib-src's makefile knows how to install it, so we don't do that here. 259 # lib-src's makefile knows how to install it, so we don't do that here.
257 # leim's makefile also knows how to install it, so we don't do that here. 260 # leim's makefile also knows how to install it, so we don't do that here.
258 # When installing the info files, we need to do special things to 261 # When installing the info files, we need to do special things to
334 touch src/config.stamp 337 touch src/config.stamp
335 338
336 lib-src/Makefile: $(srcdir)/lib-src/Makefile.in config.status 339 lib-src/Makefile: $(srcdir)/lib-src/Makefile.in config.status
337 ./config.status 340 ./config.status
338 341
339 man/Makefile: $(srcdir)/man/Makefile.in config.status 342 doc/emacs/Makefile: $(srcdir)/doc/emacs/Makefile.in config.status
340 ./config.status 343 ./config.status
341 344
342 lispref/Makefile: $(srcdir)/lispref/Makefile.in config.status 345 doc/misc/Makefile: $(srcdir)/doc/misc/Makefile.in config.status
343 ./config.status 346 ./config.status
344 347
345 lispintro/Makefile: $(srcdir)/lispintro/Makefile.in config.status 348 doc/lispref/Makefile: $(srcdir)/doc/lispref/Makefile.in config.status
349 ./config.status
350
351 doc/lispintro/Makefile: $(srcdir)/doc/lispintro/Makefile.in config.status
346 ./config.status 352 ./config.status
347 353
348 oldXMenu/Makefile: $(srcdir)/oldXMenu/Makefile.in config.status 354 oldXMenu/Makefile: $(srcdir)/oldXMenu/Makefile.in config.status
349 ./config.status 355 ./config.status
350 356
532 ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \ 538 ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
533 done; \ 539 done; \
534 else true; fi 540 else true; fi
535 -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir} 541 -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)${infodir}
536 thisdir=`/bin/pwd`; \ 542 thisdir=`/bin/pwd`; \
537 cd ${srcdir}/etc; \ 543 cd ${mansrcdir}; \
538 for page in emacs emacsclient etags ctags ; do \ 544 for page in emacs emacsclient etags ctags ; do \
539 (cd $${thisdir}; \ 545 (cd $${thisdir}; \
540 ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 $(DESTDIR)${man1dir}/$${page}${manext}; \ 546 ${INSTALL_DATA} ${mansrcdir}/$${page}.1 $(DESTDIR)${man1dir}/$${page}${manext}; \
541 chmod a+r $(DESTDIR)${man1dir}/$${page}${manext}); \ 547 chmod a+r $(DESTDIR)${man1dir}/$${page}${manext}); \
542 done 548 done
543 549
544 ### Install LEIM files. Although they are machine-independent, we 550 ### Install LEIM files. Although they are machine-independent, we
545 ### have separate target here instead of including it in 551 ### have separate target here instead of including it in
618 mostlyclean: FRC 624 mostlyclean: FRC
619 (cd src; $(MAKE) $(MFLAGS) mostlyclean) 625 (cd src; $(MAKE) $(MFLAGS) mostlyclean)
620 (cd oldXMenu; $(MAKE) $(MFLAGS) mostlyclean) 626 (cd oldXMenu; $(MAKE) $(MFLAGS) mostlyclean)
621 (cd lwlib; $(MAKE) $(MFLAGS) mostlyclean) 627 (cd lwlib; $(MAKE) $(MFLAGS) mostlyclean)
622 (cd lib-src; $(MAKE) $(MFLAGS) mostlyclean) 628 (cd lib-src; $(MAKE) $(MFLAGS) mostlyclean)
623 -(cd man && $(MAKE) $(MFLAGS) mostlyclean) 629 -(cd doc/emacs && $(MAKE) $(MFLAGS) mostlyclean)
624 -(cd lispref && $(MAKE) $(MFLAGS) mostlyclean) 630 -(cd doc/misc && $(MAKE) $(MFLAGS) mostlyclean)
625 -(cd lispintro && $(MAKE) $(MFLAGS) mostlyclean) 631 -(cd doc/lispref && $(MAKE) $(MFLAGS) mostlyclean)
632 -(cd doc/lispintro && $(MAKE) $(MFLAGS) mostlyclean)
626 (cd leim; $(MAKE) $(MFLAGS) mostlyclean) 633 (cd leim; $(MAKE) $(MFLAGS) mostlyclean)
627 634
628 ### `clean' 635 ### `clean'
629 ### Delete all files from the current directory that are normally 636 ### Delete all files from the current directory that are normally
630 ### created by building the program. Don't delete the files that 637 ### created by building the program. Don't delete the files that
636 clean: FRC 643 clean: FRC
637 (cd src; $(MAKE) $(MFLAGS) clean) 644 (cd src; $(MAKE) $(MFLAGS) clean)
638 (cd oldXMenu; $(MAKE) $(MFLAGS) clean) 645 (cd oldXMenu; $(MAKE) $(MFLAGS) clean)
639 (cd lwlib; $(MAKE) $(MFLAGS) clean) 646 (cd lwlib; $(MAKE) $(MFLAGS) clean)
640 (cd lib-src; $(MAKE) $(MFLAGS) clean) 647 (cd lib-src; $(MAKE) $(MFLAGS) clean)
641 -(cd man && $(MAKE) $(MFLAGS) clean) 648 -(cd doc/emacs && $(MAKE) $(MFLAGS) clean)
642 -(cd lispref && $(MAKE) $(MFLAGS) clean) 649 -(cd doc/misc && $(MAKE) $(MFLAGS) clean)
643 -(cd lispintro && $(MAKE) $(MFLAGS) clean) 650 -(cd doc/lispref && $(MAKE) $(MFLAGS) clean)
651 -(cd doc/lispintro && $(MAKE) $(MFLAGS) clean)
644 (cd leim; $(MAKE) $(MFLAGS) clean) 652 (cd leim; $(MAKE) $(MFLAGS) clean)
645 653
646 ### `distclean' 654 ### `distclean'
647 ### Delete all files from the current directory that are created by 655 ### Delete all files from the current directory that are created by
648 ### configuring or building the program. If you have unpacked the 656 ### configuring or building the program. If you have unpacked the
656 distclean: FRC 664 distclean: FRC
657 (cd src; $(MAKE) $(MFLAGS) distclean) 665 (cd src; $(MAKE) $(MFLAGS) distclean)
658 (cd oldXMenu; $(MAKE) $(MFLAGS) distclean) 666 (cd oldXMenu; $(MAKE) $(MFLAGS) distclean)
659 (cd lwlib; $(MAKE) $(MFLAGS) distclean) 667 (cd lwlib; $(MAKE) $(MFLAGS) distclean)
660 (cd lib-src; $(MAKE) $(MFLAGS) distclean) 668 (cd lib-src; $(MAKE) $(MFLAGS) distclean)
661 (cd man && $(MAKE) $(MFLAGS) distclean) 669 (cd doc/emacs && $(MAKE) $(MFLAGS) distclean)
662 (cd lispref && $(MAKE) $(MFLAGS) distclean) 670 (cd doc/misc && $(MAKE) $(MFLAGS) distclean)
663 (cd lispintro && $(MAKE) $(MFLAGS) distclean) 671 (cd doc/lispref && $(MAKE) $(MFLAGS) distclean)
672 (cd doc/lispintro && $(MAKE) $(MFLAGS) distclean)
664 (cd leim; $(MAKE) $(MFLAGS) distclean) 673 (cd leim; $(MAKE) $(MFLAGS) distclean)
665 (cd lisp; $(MAKE) $(MFLAGS) distclean) 674 (cd lisp; $(MAKE) $(MFLAGS) distclean)
666 ${top_distclean} 675 ${top_distclean}
667 676
668 ### `maintainer-clean' 677 ### `maintainer-clean'
679 maintainer-clean: FRC 688 maintainer-clean: FRC
680 (cd src; $(MAKE) $(MFLAGS) maintainer-clean) 689 (cd src; $(MAKE) $(MFLAGS) maintainer-clean)
681 (cd oldXMenu; $(MAKE) $(MFLAGS) maintainer-clean) 690 (cd oldXMenu; $(MAKE) $(MFLAGS) maintainer-clean)
682 (cd lwlib; $(MAKE) $(MFLAGS) maintainer-clean) 691 (cd lwlib; $(MAKE) $(MFLAGS) maintainer-clean)
683 (cd lib-src; $(MAKE) $(MFLAGS) maintainer-clean) 692 (cd lib-src; $(MAKE) $(MFLAGS) maintainer-clean)
684 -(cd man && $(MAKE) $(MFLAGS) maintainer-clean) 693 -(cd doc/emacs && $(MAKE) $(MFLAGS) maintainer-clean)
685 -(cd lispref && $(MAKE) $(MFLAGS) maintainer-clean) 694 -(cd doc/misc && $(MAKE) $(MFLAGS) maintainer-clean)
686 -(cd lispintro && $(MAKE) $(MFLAGS) maintainer-clean) 695 -(cd doc/lispref && $(MAKE) $(MFLAGS) maintainer-clean)
696 -(cd doc/lispintro && $(MAKE) $(MFLAGS) maintainer-clean)
687 (cd leim; $(MAKE) $(MFLAGS) maintainer-clean) 697 (cd leim; $(MAKE) $(MFLAGS) maintainer-clean)
688 (cd lisp; $(MAKE) $(MFLAGS) maintainer-clean) 698 (cd lisp; $(MAKE) $(MFLAGS) maintainer-clean)
689 ${top_distclean} 699 ${top_distclean}
690 700
691 ### This doesn't actually appear in the coding standards, but Karl 701 ### This doesn't actually appear in the coding standards, but Karl
718 -(cd elisp; chmod u+w Makefile README *.texi) 728 -(cd elisp; chmod u+w Makefile README *.texi)
719 (cd etc; $(MAKE) $(MFLAGS) unlock) 729 (cd etc; $(MAKE) $(MFLAGS) unlock)
720 (cd lib-src; $(MAKE) $(MFLAGS) unlock) 730 (cd lib-src; $(MAKE) $(MFLAGS) unlock)
721 (cd lisp; $(MAKE) $(MFLAGS) unlock) 731 (cd lisp; $(MAKE) $(MFLAGS) unlock)
722 (cd lisp/term; chmod u+w README *.el) 732 (cd lisp/term; chmod u+w README *.el)
723 (cd man; chmod u+w *texi* ChangeLog split-man) 733 (cd doc/emacs; chmod u+w *.texi ChangeLog)
724 (cd lispref; chmod u+w *texi* ChangeLog) 734 (cd doc/misc; chmod u+w *.texi ChangeLog)
725 (cd lispintro; chmod u+w *texi* ChangeLog) 735 (cd doc/lispref; chmod u+w *texi* ChangeLog)
736 (cd doc/lispintro; chmod u+w *texi* ChangeLog)
726 (cd oldXMenu; chmod u+w *.[ch] Makefile README) 737 (cd oldXMenu; chmod u+w *.[ch] Makefile README)
727 (cd lwlib; chmod u+w *.[ch] Makefile README) 738 (cd lwlib; chmod u+w *.[ch] Makefile README)
728 (cd src; $(MAKE) $(MFLAGS) unlock) 739 (cd src; $(MAKE) $(MFLAGS) unlock)
729 740
730 relock: 741 relock:
731 chmod u-w $(SOURCES) 742 chmod u-w $(SOURCES)
732 -(cd elisp; chmod u-w Makefile README *.texi) 743 -(cd elisp; chmod u-w Makefile README *.texi)
733 (cd etc; $(MAKE) $(MFLAGS) relock) 744 (cd etc; $(MAKE) $(MFLAGS) relock)
734 (cd lib-src; $(MAKE) $(MFLAGS) relock) 745 (cd lib-src; $(MAKE) $(MFLAGS) relock)
735 (cd lisp; $(MAKE) $(MFLAGS) relock) 746 (cd lisp; $(MAKE) $(MFLAGS) relock)
736 (cd lisp/term; chmod u+w README *.el) 747 (cd lisp/term; chmod u-w README *.el)
737 (cd man; chmod u+w *texi* ChangeLog split-man) 748 (cd doc/emacs; chmod u-w *.texi ChangeLog)
738 (cd lispref; chmod u+w *texi* ChangeLog) 749 (cd doc/misc; chmod u-w *.texi ChangeLog)
739 (cd lispintro; chmod u+w *texi* ChangeLog) 750 (cd doc/lispref; chmod u-w *texi* ChangeLog)
740 (cd oldXMenu; chmod u+w *.[ch] Makefile README) 751 (cd doc/lispintro; chmod u-w *texi* ChangeLog)
741 (cd lwlib; chmod u+w *.[ch] Makefile README) 752 (cd oldXMenu; chmod u-w *.[ch] Makefile README)
753 (cd lwlib; chmod u-w *.[ch] Makefile README)
742 (cd src; $(MAKE) $(MFLAGS) relock) 754 (cd src; $(MAKE) $(MFLAGS) relock)
743 755
744 # The src subdir knows how to do the right thing 756 # The src subdir knows how to do the right thing
745 # even when the build directory and source dir are different. 757 # even when the build directory and source dir are different.
746 TAGS tags: lib-src src 758 TAGS tags: lib-src src
756 force-info: 768 force-info:
757 # Note that man/Makefile knows how to 769 # Note that man/Makefile knows how to
758 # put the info files in $(srcdir), 770 # put the info files in $(srcdir),
759 # so we can do ok running make in the build dir. 771 # so we can do ok running make in the build dir.
760 info: force-info 772 info: force-info
761 -(cd man; $(MAKE) $(MFLAGS) info) 773 -(cd doc/emacs; $(MAKE) $(MFLAGS) info)
762 -(cd lispref; $(MAKE) $(MFLAGS) info) 774 -(cd doc/misc; $(MAKE) $(MFLAGS) info)
763 -(cd lispintro; $(MAKE) $(MFLAGS) info) 775 -(cd doc/lispref; $(MAKE) $(MFLAGS) info)
776 -(cd doc/lispintro; $(MAKE) $(MFLAGS) info)
764 dvi: 777 dvi:
765 (cd man; $(MAKE) $(MFLAGS) dvi) 778 (cd doc/emacs; $(MAKE) $(MFLAGS) dvi)
766 (cd lispref; $(MAKE) $(MFLAGS) elisp.dvi) 779 (cd doc/misc; $(MAKE) $(MFLAGS) dvi)
767 (cd lispintro; $(MAKE) $(MFLAGS) emacs-lisp-intro.dvi) 780 (cd doc/lispref; $(MAKE) $(MFLAGS) elisp.dvi)
781 (cd doc/lispintro; $(MAKE) $(MFLAGS) emacs-lisp-intro.dvi)
768 782
769 #### Bootstrapping. 783 #### Bootstrapping.
770 784
771 ### This is meant for Emacs maintainers only. It first cleans the 785 ### This is meant for Emacs maintainers only. It first cleans the
772 ### lisp subdirectory, removing all compiled Lisp files. Then a 786 ### lisp subdirectory, removing all compiled Lisp files. Then a
811 bootstrap-clean-before-fast: FRC 825 bootstrap-clean-before-fast: FRC
812 (cd src; $(MAKE) $(MFLAGS) mostlyclean) 826 (cd src; $(MAKE) $(MFLAGS) mostlyclean)
813 (cd oldXMenu; $(MAKE) $(MFLAGS) clean) 827 (cd oldXMenu; $(MAKE) $(MFLAGS) clean)
814 (cd lwlib; $(MAKE) $(MFLAGS) clean) 828 (cd lwlib; $(MAKE) $(MFLAGS) clean)
815 (cd lib-src; $(MAKE) $(MFLAGS) clean) 829 (cd lib-src; $(MAKE) $(MFLAGS) clean)
816 -(cd man && $(MAKE) $(MFLAGS) clean) 830 -(cd doc/emacs && $(MAKE) $(MFLAGS) clean)
817 -(cd lispref && $(MAKE) $(MFLAGS) clean) 831 -(cd doc/misc && $(MAKE) $(MFLAGS) clean)
818 -(cd lispintro && $(MAKE) $(MFLAGS) clean) 832 -(cd doc/lispref && $(MAKE) $(MFLAGS) clean)
833 -(cd doc/lispintro && $(MAKE) $(MFLAGS) clean)
819 (cd leim; $(MAKE) $(MFLAGS) clean) 834 (cd leim; $(MAKE) $(MFLAGS) clean)