aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-08-26 23:58:08 -0700
committerGlenn Morris2013-08-26 23:58:08 -0700
commit61ac6b9f821504ce12e0797a1fcf403e951d193b (patch)
treeec41a1167f6905dd14216e6b2a788ec7da8aa7e1
parentd350e350eaf4872d123e0ab873c4a095099013c9 (diff)
downloademacs-61ac6b9f821504ce12e0797a1fcf403e951d193b.tar.gz
emacs-61ac6b9f821504ce12e0797a1fcf403e951d193b.zip
* Makefile.in (mostlyclean, clean, distclean, bootstrap-clean)
(maintainer-clean, check-declare): Remove pointless subshells. Check cd return value.
Diffstat
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.in106
2 files changed, 59 insertions, 53 deletions
diff --git a/ChangeLog b/ChangeLog
index 5412faddbfa..d7c30e1872f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
12013-08-27 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (mostlyclean, clean, distclean, bootstrap-clean)
4 (maintainer-clean, check-declare): Remove pointless subshells.
5 Check cd return value.
6
12013-08-26 Paul Eggert <eggert@cs.ucla.edu> 72013-08-26 Paul Eggert <eggert@cs.ucla.edu>
2 8
3 Minor merge from gnulib (mostly just for texinfo.tex). 9 Minor merge from gnulib (mostly just for texinfo.tex).
diff --git a/Makefile.in b/Makefile.in
index a29fd353346..e4b5ef3d07c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -797,17 +797,17 @@ FRC:
797### target for GCC does not delete `libgcc.a', because recompiling it 797### target for GCC does not delete `libgcc.a', because recompiling it
798### is rarely necessary and takes a lot of time. 798### is rarely necessary and takes a lot of time.
799mostlyclean: FRC 799mostlyclean: FRC
800 (cd src; $(MAKE) $(MFLAGS) mostlyclean) 800 cd src && $(MAKE) $(MFLAGS) mostlyclean
801 (cd oldXMenu; $(MAKE) $(MFLAGS) mostlyclean) 801 cd oldXMenu && $(MAKE) $(MFLAGS) mostlyclean
802 (cd lwlib; $(MAKE) $(MFLAGS) mostlyclean) 802 cd lwlib && $(MAKE) $(MFLAGS) mostlyclean
803 (cd lib; $(MAKE) $(MFLAGS) mostlyclean) 803 cd lib && $(MAKE) $(MFLAGS) mostlyclean
804 (cd lib-src; $(MAKE) $(MFLAGS) mostlyclean) 804 cd lib-src && $(MAKE) $(MFLAGS) mostlyclean
805 (cd nt; $(MAKE) $(MFLAGS) mostlyclean) 805 cd nt && $(MAKE) $(MFLAGS) mostlyclean
806 -(cd doc/emacs && $(MAKE) $(MFLAGS) mostlyclean) 806 -cd doc/emacs && $(MAKE) $(MFLAGS) mostlyclean
807 -(cd doc/misc && $(MAKE) $(MFLAGS) mostlyclean) 807 -cd doc/misc && $(MAKE) $(MFLAGS) mostlyclean
808 -(cd doc/lispref && $(MAKE) $(MFLAGS) mostlyclean) 808 -cd doc/lispref && $(MAKE) $(MFLAGS) mostlyclean
809 -(cd doc/lispintro && $(MAKE) $(MFLAGS) mostlyclean) 809 -cd doc/lispintro && $(MAKE) $(MFLAGS) mostlyclean
810 (cd leim; $(MAKE) $(MFLAGS) mostlyclean) 810 cd leim && $(MAKE) $(MFLAGS) mostlyclean
811 811
812### `clean' 812### `clean'
813### Delete all files from the current directory that are normally 813### Delete all files from the current directory that are normally
@@ -819,18 +819,18 @@ mostlyclean: FRC
819### Delete `.dvi' files here if they are not part of the distribution. 819### Delete `.dvi' files here if they are not part of the distribution.
820clean: FRC 820clean: FRC
821 -rm -f etc/emacs.tmpdesktop 821 -rm -f etc/emacs.tmpdesktop
822 (cd src; $(MAKE) $(MFLAGS) clean) 822 cd src && $(MAKE) $(MFLAGS) clean
823 (cd oldXMenu; $(MAKE) $(MFLAGS) clean) 823 cd oldXMenu && $(MAKE) $(MFLAGS) clean
824 (cd lwlib; $(MAKE) $(MFLAGS) clean) 824 cd lwlib && $(MAKE) $(MFLAGS) clean
825 (cd lib; $(MAKE) $(MFLAGS) clean) 825 cd lib && $(MAKE) $(MFLAGS) clean
826 (cd lib-src; $(MAKE) $(MFLAGS) clean) 826 cd lib-src && $(MAKE) $(MFLAGS) clean
827 (cd nt; $(MAKE) $(MFLAGS) clean) 827 cd nt && $(MAKE) $(MFLAGS) clean
828 -(cd doc/emacs && $(MAKE) $(MFLAGS) clean) 828 -cd doc/emacs && $(MAKE) $(MFLAGS) clean
829 -(cd doc/misc && $(MAKE) $(MFLAGS) clean) 829 -cd doc/misc && $(MAKE) $(MFLAGS) clean
830 -(cd doc/lispref && $(MAKE) $(MFLAGS) clean) 830 -cd doc/lispref && $(MAKE) $(MFLAGS) clean
831 -(cd doc/lispintro && $(MAKE) $(MFLAGS) clean) 831 -cd doc/lispintro && $(MAKE) $(MFLAGS) clean
832 (cd leim; $(MAKE) $(MFLAGS) clean) 832 cd leim && $(MAKE) $(MFLAGS) clean
833 (cd nextstep && $(MAKE) $(MFLAGS) clean) 833 cd nextstep && $(MAKE) $(MFLAGS) clean
834 834
835### `bootclean' 835### `bootclean'
836### Delete all files that need to be remade for a clean bootstrap. 836### Delete all files that need to be remade for a clean bootstrap.
@@ -846,19 +846,19 @@ top_distclean=\
846 ${top_bootclean}; \ 846 ${top_bootclean}; \
847 rm -f config.status config.log~ Makefile stamp-h1 ${SUBDIR_MAKEFILES} 847 rm -f config.status config.log~ Makefile stamp-h1 ${SUBDIR_MAKEFILES}
848distclean: FRC 848distclean: FRC
849 (cd src; $(MAKE) $(MFLAGS) distclean) 849 cd src && $(MAKE) $(MFLAGS) distclean
850 (cd oldXMenu; $(MAKE) $(MFLAGS) distclean) 850 cd oldXMenu && $(MAKE) $(MFLAGS) distclean
851 (cd lwlib; $(MAKE) $(MFLAGS) distclean) 851 cd lwlib && $(MAKE) $(MFLAGS) distclean
852 (cd lib; $(MAKE) $(MFLAGS) distclean) 852 cd lib && $(MAKE) $(MFLAGS) distclean
853 (cd lib-src; $(MAKE) $(MFLAGS) distclean) 853 cd lib-src && $(MAKE) $(MFLAGS) distclean
854 (cd nt; $(MAKE) $(MFLAGS) distclean) 854 cd nt && $(MAKE) $(MFLAGS) distclean
855 (cd doc/emacs && $(MAKE) $(MFLAGS) distclean) 855 cd doc/emacs && $(MAKE) $(MFLAGS) distclean
856 (cd doc/misc && $(MAKE) $(MFLAGS) distclean) 856 cd doc/misc && $(MAKE) $(MFLAGS) distclean
857 (cd doc/lispref && $(MAKE) $(MFLAGS) distclean) 857 cd doc/lispref && $(MAKE) $(MFLAGS) distclean
858 (cd doc/lispintro && $(MAKE) $(MFLAGS) distclean) 858 cd doc/lispintro && $(MAKE) $(MFLAGS) distclean
859 (cd leim; $(MAKE) $(MFLAGS) distclean) 859 cd leim && $(MAKE) $(MFLAGS) distclean
860 (cd lisp; $(MAKE) $(MFLAGS) distclean) 860 cd lisp && $(MAKE) $(MFLAGS) distclean
861 (cd nextstep && $(MAKE) $(MFLAGS) distclean) 861 cd nextstep && $(MAKE) $(MFLAGS) distclean
862 [ ! -d test/automated ] || { \ 862 [ ! -d test/automated ] || { \
863 cd test/automated && $(MAKE) $(MFLAGS) distclean; \ 863 cd test/automated && $(MAKE) $(MFLAGS) distclean; \
864 } 864 }
@@ -868,19 +868,19 @@ distclean: FRC
868### Delete everything that can be reconstructed by `make' and that 868### Delete everything that can be reconstructed by `make' and that
869### needs to be deleted in order to force a bootstrap from a clean state. 869### needs to be deleted in order to force a bootstrap from a clean state.
870bootstrap-clean: FRC 870bootstrap-clean: FRC
871 (cd src; $(MAKE) $(MFLAGS) bootstrap-clean) 871 cd src && $(MAKE) $(MFLAGS) bootstrap-clean
872 (cd oldXMenu; $(MAKE) $(MFLAGS) maintainer-clean) 872 cd oldXMenu && $(MAKE) $(MFLAGS) maintainer-clean
873 (cd lwlib; $(MAKE) $(MFLAGS) maintainer-clean) 873 cd lwlib && $(MAKE) $(MFLAGS) maintainer-clean
874 (cd lib; $(MAKE) $(MFLAGS) maintainer-clean) 874 cd lib && $(MAKE) $(MFLAGS) maintainer-clean
875 (cd lib-src; $(MAKE) $(MFLAGS) maintainer-clean) 875 cd lib-src && $(MAKE) $(MFLAGS) maintainer-clean
876 (cd nt; $(MAKE) $(MFLAGS) maintainer-clean) 876 cd nt && $(MAKE) $(MFLAGS) maintainer-clean
877 -(cd doc/emacs && $(MAKE) $(MFLAGS) maintainer-clean) 877 -cd doc/emacs && $(MAKE) $(MFLAGS) maintainer-clean
878 -(cd doc/misc && $(MAKE) $(MFLAGS) maintainer-clean) 878 -cd doc/misc && $(MAKE) $(MFLAGS) maintainer-clean
879 -(cd doc/lispref && $(MAKE) $(MFLAGS) maintainer-clean) 879 -cd doc/lispref && $(MAKE) $(MFLAGS) maintainer-clean
880 -(cd doc/lispintro && $(MAKE) $(MFLAGS) maintainer-clean) 880 -cd doc/lispintro && $(MAKE) $(MFLAGS) maintainer-clean
881 (cd leim; $(MAKE) $(MFLAGS) maintainer-clean) 881 cd leim && $(MAKE) $(MFLAGS) maintainer-clean
882 (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean) 882 cd lisp && $(MAKE) $(MFLAGS) bootstrap-clean
883 (cd nextstep && $(MAKE) $(MFLAGS) maintainer-clean) 883 cd nextstep && $(MAKE) $(MFLAGS) maintainer-clean
884 [ ! -d test/automated ] || { \ 884 [ ! -d test/automated ] || { \
885 cd test/automated && $(MAKE) $(MFLAGS) bootstrap-clean; \ 885 cd test/automated && $(MAKE) $(MFLAGS) bootstrap-clean; \
886 } 886 }
@@ -902,8 +902,8 @@ top_maintainer_clean=\
902 ${top_distclean}; \ 902 ${top_distclean}; \
903 rm -fr autom4te.cache 903 rm -fr autom4te.cache
904maintainer-clean: bootstrap-clean FRC 904maintainer-clean: bootstrap-clean FRC
905 (cd src; $(MAKE) $(MFLAGS) maintainer-clean) 905 cd src && $(MAKE) $(MFLAGS) maintainer-clean
906 (cd lisp; $(MAKE) $(MFLAGS) maintainer-clean) 906 cd lisp && $(MAKE) $(MFLAGS) maintainer-clean
907 [ ! -d test/automated ] || { \ 907 [ ! -d test/automated ] || { \
908 cd test/automated && $(MAKE) $(MFLAGS) maintainer-clean; \ 908 cd test/automated && $(MAKE) $(MFLAGS) maintainer-clean; \
909 } 909 }
@@ -1067,5 +1067,5 @@ check-declare:
1067 echo "You must build Emacs to use this command"; \ 1067 echo "You must build Emacs to use this command"; \
1068 exit 1; \ 1068 exit 1; \
1069 fi 1069 fi
1070 (cd leim; $(MAKE) $(MFLAGS) $@) 1070 cd leim && $(MAKE) $(MFLAGS) $@
1071 (cd lisp; $(MAKE) $(MFLAGS) $@) 1071 cd lisp && $(MAKE) $(MFLAGS) $@
generated by cgit v1.2.1 (git 2.18.0) at 2026-03-25 16:21:44 +0000