diff options
| author | Andreas Schwab | 2009-12-17 00:03:51 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2009-12-17 00:03:51 +0000 |
| commit | f4c210265dc3ba6216ec6579713442063dafc880 (patch) | |
| tree | 628c722795908ff135e29295b0d15851e804f7fc /src | |
| parent | 72b57560300f433795ef02115b7085e5699cea03 (diff) | |
| download | emacs-f4c210265dc3ba6216ec6579713442063dafc880.tar.gz emacs-f4c210265dc3ba6216ec6579713442063dafc880.zip | |
(prefix-args${EXEEXT}): Don't compile prefix-args.c
twice.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6c39715fed3..0e1e60a25cc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-12-16 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * Makefile.in (prefix-args${EXEEXT}): Don't compile prefix-args.c | ||
| 4 | twice. | ||
| 5 | |||
| 1 | 2009-12-15 Chong Yidong <cyd@stupidchicken.com> | 6 | 2009-12-15 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * xdisp.c (decode_mode_spec): Inhibit garbage collection when | 8 | * xdisp.c (decode_mode_spec): Inhibit garbage collection when |
diff --git a/src/Makefile.in b/src/Makefile.in index f726f88ce0e..0f11cd8019a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -976,7 +976,7 @@ temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} pre | |||
| 976 | often contain options that have to do with using Emacs''s crt0, | 976 | often contain options that have to do with using Emacs''s crt0, |
| 977 | which are only good with temacs. */ | 977 | which are only good with temacs. */ |
| 978 | prefix-args${EXEEXT}: prefix-args.o $(config_h) | 978 | prefix-args${EXEEXT}: prefix-args.o $(config_h) |
| 979 | $(CC) $(ALL_CFLAGS) $(LDFLAGS) ${srcdir}/prefix-args.c -o prefix-args | 979 | $(CC) $(LDFLAGS) prefix-args.o -o prefix-args |
| 980 | 980 | ||
| 981 | #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (USE_GTK) | 981 | #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (USE_GTK) |
| 982 | 982 | ||