diff options
| author | Glenn Morris | 2010-04-29 18:18:09 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-04-29 18:18:09 -0700 |
| commit | 0a7df391802ef0fc6dc7e2f682c00a85117a2c7a (patch) | |
| tree | ab2917d0e67d3718537d6e143f192676c9fd642f | |
| parent | 27d3cd56caf8cfac459bd114cb184989d2c62423 (diff) | |
| download | emacs-0a7df391802ef0fc6dc7e2f682c00a85117a2c7a.tar.gz emacs-0a7df391802ef0fc6dc7e2f682c00a85117a2c7a.zip | |
* src/Makefile.in (nsfns.o): Remove duplicate nsgui.h dependency.
| -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 c24493293e8..2d6c3668824 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-04-30 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (nsfns.o): Remove duplicate nsgui.h dependency. | ||
| 4 | |||
| 1 | 2010-04-29 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2010-04-29 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * process.c (read_process_output, exec_sentinel): Don't burp if the | 7 | * process.c (read_process_output, exec_sentinel): Don't burp if the |
diff --git a/src/Makefile.in b/src/Makefile.in index 974a2332be1..fe8028a3775 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -938,7 +938,7 @@ msdos.o: msdos.c msdos.h dosfns.h systime.h termhooks.h dispextern.h frame.h \ | |||
| 938 | termopts.h termchar.h character.h coding.h ccl.h disptab.h window.h \ | 938 | termopts.h termchar.h character.h coding.h ccl.h disptab.h window.h \ |
| 939 | keyboard.h $(INTERVALS_H) buffer.h commands.h blockinput.h atimer.h lisp.h $(config_h) | 939 | keyboard.h $(INTERVALS_H) buffer.h commands.h blockinput.h atimer.h lisp.h $(config_h) |
| 940 | nsfns.o: nsfns.m charset.h nsterm.h nsgui.h frame.h window.h buffer.h \ | 940 | nsfns.o: nsfns.m charset.h nsterm.h nsgui.h frame.h window.h buffer.h \ |
| 941 | dispextern.h nsgui.h fontset.h $(INTERVALS_H) keyboard.h blockinput.h \ | 941 | dispextern.h fontset.h $(INTERVALS_H) keyboard.h blockinput.h \ |
| 942 | atimer.h systime.h epaths.h termhooks.h coding.h systime.h lisp.h $(config_h) | 942 | atimer.h systime.h epaths.h termhooks.h coding.h systime.h lisp.h $(config_h) |
| 943 | nsfont.o: nsterm.h dispextern.h frame.h lisp.h lisp.h $(config_h) | 943 | nsfont.o: nsterm.h dispextern.h frame.h lisp.h lisp.h $(config_h) |
| 944 | nsimage.o: nsimage.m nsterm.h lisp.h $(config_h) | 944 | nsimage.o: nsimage.m nsterm.h lisp.h $(config_h) |