diff options
| author | Dan Nicolaescu | 2007-11-01 07:16:11 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2007-11-01 07:16:11 +0000 |
| commit | 04a697fefe9b64173b39d07d9b5bb857e16d6c40 (patch) | |
| tree | cb383c0b434106298badb3efc9e6be582173b1c0 | |
| parent | 68013cfaa57f810dedd0a7624ad8aae1e71fe4b7 (diff) | |
| download | emacs-04a697fefe9b64173b39d07d9b5bb857e16d6c40.tar.gz emacs-04a697fefe9b64173b39d07d9b5bb857e16d6c40.zip | |
* makefile.w32-in (obj): Remove sunfns.o.
* makefile.MPW (SOME_MACHINE_OBJECTS): Remove sunfns.o.
* Makefile.in: Remove references to sunfns.c and sunfns.o.
| -rw-r--r-- | admin/MAINTAINERS | 1 | ||||
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 2 | ||||
| -rw-r--r-- | mac/ChangeLog | 4 | ||||
| -rw-r--r-- | mac/makefile.MPW | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 4 |
7 files changed, 15 insertions, 6 deletions
diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index 92f1273b116..f14bc2068db 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS | |||
| @@ -188,7 +188,6 @@ src/scroll.c | |||
| 188 | src/search.c | 188 | src/search.c |
| 189 | src/sound.c | 189 | src/sound.c |
| 190 | src/strftime.c | 190 | src/strftime.c |
| 191 | src/sunfns.c | ||
| 192 | src/sysdep.c | 191 | src/sysdep.c |
| 193 | src/termcap.c | 192 | src/termcap.c |
| 194 | src/terminfo.c | 193 | src/terminfo.c |
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index ec7ae3272ea..2c178ba8da9 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-11-01 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * makefile.w32-in (obj): Remove sunfns.o. | ||
| 4 | |||
| 1 | 2007-10-28 Juanma Barranquero <lekktu@gmail.com> | 5 | 2007-10-28 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * makefile.w32-in (obj): Remove abbrev.o. | 7 | * makefile.w32-in (obj): Remove abbrev.o. |
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 9aa9aeea27a..9a611b8e3f9 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in | |||
| @@ -142,7 +142,7 @@ $(BLD)/ctags.$(O): ctags.c | |||
| 142 | # make-docfile blindly replaces .o with .c anyway. Keep .o in this list | 142 | # make-docfile blindly replaces .o with .c anyway. Keep .o in this list |
| 143 | # as it is required by code in doc.c. | 143 | # as it is required by code in doc.c. |
| 144 | # | 144 | # |
| 145 | obj= sunfns.o dosfns.o msdos.o \ | 145 | obj= dosfns.o msdos.o \ |
| 146 | xterm.o xfns.o xmenu.o xselect.o xrdb.o fringe.o image.o \ | 146 | xterm.o xfns.o xmenu.o xselect.o xrdb.o fringe.o image.o \ |
| 147 | mac.o macterm.o macfns.o macmenu.o fontset.o \ | 147 | mac.o macterm.o macfns.o macmenu.o fontset.o \ |
| 148 | w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \ | 148 | w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \ |
diff --git a/mac/ChangeLog b/mac/ChangeLog index 326a844b638..7b97e14f590 100644 --- a/mac/ChangeLog +++ b/mac/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-11-01 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * makefile.MPW (SOME_MACHINE_OBJECTS): Remove sunfns.o. | ||
| 4 | |||
| 1 | 2007-09-13 Seiji Zenitani <zenitani@mac.com> | 5 | 2007-09-13 Seiji Zenitani <zenitani@mac.com> |
| 2 | Takanori Yamamoto <takanori.yamamoto@gmail.com> | 6 | Takanori Yamamoto <takanori.yamamoto@gmail.com> |
| 3 | Kentaro Ohkouchi <nanasess@fsm.ne.jp> | 7 | Kentaro Ohkouchi <nanasess@fsm.ne.jp> |
diff --git a/mac/makefile.MPW b/mac/makefile.MPW index 47fc1f9abf2..c7cb790ce92 100644 --- a/mac/makefile.MPW +++ b/mac/makefile.MPW | |||
| @@ -1017,7 +1017,7 @@ DistClean Ä Clean | |||
| 1017 | # Variables and rules for target "Doc" # | 1017 | # Variables and rules for target "Doc" # |
| 1018 | #--------------------------------------# | 1018 | #--------------------------------------# |
| 1019 | 1019 | ||
| 1020 | SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o ¶ | 1020 | SOME_MACHINE_OBJECTS = dosfns.o msdos.o ¶ |
| 1021 | xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o ¶ | 1021 | xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o ¶ |
| 1022 | mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o ¶ | 1022 | mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o ¶ |
| 1023 | w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o ¶ | 1023 | w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o ¶ |
diff --git a/src/ChangeLog b/src/ChangeLog index 82d28ab24d1..553bf65820a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-11-01 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * Makefile.in: Remove references to sunfns.c and sunfns.o. | ||
| 4 | |||
| 1 | 2007-11-01 Johan Bockg,Ae(Brd <bojohan@gnu.org> | 5 | 2007-11-01 Johan Bockg,Ae(Brd <bojohan@gnu.org> |
| 2 | 6 | ||
| 3 | * macterm.c, w32term.c, xterm.c (x_draw_stretch_glyph_string): | 7 | * macterm.c, w32term.c, xterm.c (x_draw_stretch_glyph_string): |
diff --git a/src/Makefile.in b/src/Makefile.in index 25673f95657..cb183e6bbf2 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -604,7 +604,7 @@ obj= dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \ | |||
| 604 | /* Object files used on some machine or other. | 604 | /* Object files used on some machine or other. |
| 605 | These go in the DOC file on all machines | 605 | These go in the DOC file on all machines |
| 606 | in case they are needed there. */ | 606 | in case they are needed there. */ |
| 607 | SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o \ | 607 | SOME_MACHINE_OBJECTS = dosfns.o msdos.o \ |
| 608 | xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ | 608 | xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ |
| 609 | mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \ | 609 | mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \ |
| 610 | w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \ | 610 | w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \ |
| @@ -1266,8 +1266,6 @@ composite.o: composite.c buffer.h charset.h $(INTERVAL_SRC) $(config_h) | |||
| 1266 | OTHER_FILES and OBJECTS_MACHINE | 1266 | OTHER_FILES and OBJECTS_MACHINE |
| 1267 | select which of these should be compiled. */ | 1267 | select which of these should be compiled. */ |
| 1268 | 1268 | ||
| 1269 | sunfns.o: sunfns.c buffer.h window.h dispextern.h termhooks.h $(config_h) | ||
| 1270 | |||
| 1271 | #ifdef HAVE_CARBON | 1269 | #ifdef HAVE_CARBON |
| 1272 | buffer.o callint.o cmds.o dispnew.o editfns.o fileio.o frame.o \ | 1270 | buffer.o callint.o cmds.o dispnew.o editfns.o fileio.o frame.o \ |
| 1273 | fontset.o indent.o insdel.o keyboard.o macros.o minibuf.o msdos.o process.o \ | 1271 | fontset.o indent.o insdel.o keyboard.o macros.o minibuf.o msdos.o process.o \ |