diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6b3c5bc3ab4..26da194f228 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-02-19 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS. | ||
| 4 | |||
| 1 | 2011-02-17 Kenichi Handa <handa@m17n.org> | 5 | 2011-02-17 Kenichi Handa <handa@m17n.org> |
| 2 | 6 | ||
| 3 | * font.c (font_open_entity): Be sure to set scaled_pixel_size. | 7 | * font.c (font_open_entity): Be sure to set scaled_pixel_size. |
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. */ |
| 981 | prefix-args${EXEEXT}: prefix-args.o $(config_h) | 981 | prefix-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 | ||