summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2010-05-26 22:43:27 -0700
committerGlenn Morris <rgm@gnu.org>2010-05-26 22:43:27 -0700
commit81ac4f35366bfc525fa6ed89e0b5aaa90a05c902 (patch)
treee77b927e7e5fcf2d0ac05bcacb13baa10ed4b285 /admin
parent11e4d8c0d35ec52819d5ce11176fc1f53b9890e0 (diff)
downloademacs-81ac4f35366bfc525fa6ed89e0b5aaa90a05c902.tar.gz
Do not preprocess src/Makefile.in.
* configure.in: Do not preprocess src/Makefile.in. (cpp_undefs, CPP_NEED_TRADITIONAL): Remove. (AC_EGREP_CPP): Test no longer needed. * configure: Regenerate. * config.bat: Do not preprocess src/Makefile.in. * make-dist: No more Makefile.c files. * INSTALL, src/README: Makefiles are not preprocessed. * src/Makefile.in, src/autodeps.mk, src/deps.mk, src/ns.mk: Convert comments to Makefile format. * lib-src/Makefile.in (distclean): No more Makefile.c. * src/Makefile.in (bootstrap-clean): No more Makefile.c. * admin/notes/cpp: Remove file. * admin/quick-install-emacs (AVOID): No more Makefile.c files. * etc/PROBLEMS, etc/MACHINES: Remove details of cpp problems which can no longer occur.
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog6
-rw-r--r--admin/notes/cpp14
-rwxr-xr-xadmin/quick-install-emacs6
3 files changed, 9 insertions, 17 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 54be4a7fec3..2f6efffd157 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-27 Glenn Morris <rgm@gnu.org>
+
+ * quick-install-emacs (AVOID): No more Makefile.c files.
+
+ * notes/cpp: Remove file.
+
2010-05-15 Ken Raeburn <raeburn@raeburn.org>
* admin.el (set-version, set-copyright): Update emacs.c instead of
diff --git a/admin/notes/cpp b/admin/notes/cpp
deleted file mode 100644
index 73b4b3d64ff..00000000000
--- a/admin/notes/cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-ttn 2003-04-09
-
-we use a C preprocesor not only in the normal compilation of .c files
-into object files, but also for creating src/Makefile.
-(delimited by comment "start of cpp stuff"). some cpp implementations
-insert whitespace in between tokens.
-
-during makefile creation, the preprocessor symbol NOT_C_CODE is defined.
-this should not be defined for normal .c file compilation.
-
-there has been discussion on eliminating this use of cpp and relying
-solely on autoconf processing. rms says to leave it be.
-
-;;; arch-tag: d654291e-9fc8-41b7-ab0c-d3cde842a8e0
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index d603d8fd0d6..39b200b5102 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -1,8 +1,8 @@
#!/bin/sh
### quick-install-emacs --- do a halfway-decent job of installing emacs quickly
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-## Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+## 2010 Free Software Foundation, Inc.
## Author: Miles Bader <miles@gnu.org>
@@ -31,7 +31,7 @@
PUBLIC_LIBSRC_BINARIES='b2m emacsclient etags ctags ebrowse'
PUBLIC_LIBSRC_SCRIPTS='grep-changelog rcs-checkin'
-AVOID="CVS -DIC README COPYING ChangeLog ~ [.]orig$ [.]rej$ Makefile$ Makefile.in$ Makefile.c$ makefile$ makefile.w32-in$ stamp-subdir [.]cvsignore [.]arch-ids [{]arch[}] [.][cho]$ make-docfile testfile test-distrib"
+AVOID="CVS -DIC README COPYING ChangeLog ~ [.]orig$ [.]rej$ Makefile$ Makefile.in$ makefile$ makefile.w32-in$ stamp-subdir [.]cvsignore [.]arch-ids [{]arch[}] [.][cho]$ make-docfile testfile test-distrib"
# Prune old binaries lying around in the source tree
PRUNE=no