aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2011-02-19 12:34:50 -0500
committerChong Yidong2011-02-19 12:34:50 -0500
commitf6ed3dbe85f0960cca1daa13cb8757225feb9bf3 (patch)
tree81c2a583fe18f0e2d3cc4888e4c210fa3e1fa418 /src
parent51a12115438e8efb629fcc3f5abde282aa650572 (diff)
downloademacs-f6ed3dbe85f0960cca1daa13cb8757225feb9bf3.tar.gz
emacs-f6ed3dbe85f0960cca1daa13cb8757225feb9bf3.zip
* Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS.
See http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00715.html
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/Makefile.in2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 68e9c76a437..3a356bb81aa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-02-19 Chong Yidong <cyd@stupidchicken.com>
2
3 * Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS.
4
12011-02-13 Eli Zaretskii <eliz@gnu.org> 52011-02-13 Eli Zaretskii <eliz@gnu.org>
2 6
3 * xdisp.c (redisplay_internal): Resynchronize `w' if the selected 7 * xdisp.c (redisplay_internal): Resynchronize `w' if the selected
diff --git a/src/Makefile.in b/src/Makefile.in
index e92f2bb3b85..7d936144583 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -979,7 +979,7 @@ temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} pre
979 often contain options that have to do with using Emacs''s crt0, 979 often contain options that have to do with using Emacs''s crt0,
980 which are only good with temacs. */ 980 which are only good with temacs. */
981prefix-args${EXEEXT}: prefix-args.o $(config_h) 981prefix-args${EXEEXT}: prefix-args.o $(config_h)
982 $(CC) $(LDFLAGS) prefix-args.o -o prefix-args 982 $(CC) $(ALL_CFLAGS) $(LDFLAGS) prefix-args.o -o prefix-args
983 983
984#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (USE_GTK) 984#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (USE_GTK)
985 985