diff options
| author | Adrian Robert | 2008-07-15 18:35:28 +0000 |
|---|---|---|
| committer | Adrian Robert | 2008-07-15 18:35:28 +0000 |
| commit | a68fda4a8c814ca368fc6d6b9549700c1d1c764a (patch) | |
| tree | 47b55090da1c08af2737a672c5a0e99cb3528562 /src/Makefile.in | |
| parent | edfda78355c5528eee489fa8a7f9c73bf8e734f2 (diff) | |
| download | emacs-a68fda4a8c814ca368fc6d6b9549700c1d1c764a.tar.gz emacs-a68fda4a8c814ca368fc6d6b9549700c1d1c764a.zip | |
adding forgotten file src/nsfont.m for emacs.app merge
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 123a49fca68..1083dacdc87 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -535,7 +535,6 @@ emacsappsrc = ${srcdir}/../mac/Emacs.app/ | |||
| 535 | NS_OBJ= nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \ | 535 | NS_OBJ= nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \ |
| 536 | fontset.o fringe.o image.o | 536 | fontset.o fringe.o image.o |
| 537 | emacsapp = $(PWD)/../nextstep/build/Emacs.app/ | 537 | emacsapp = $(PWD)/../nextstep/build/Emacs.app/ |
| 538 | FONT_DRIVERS = nsfont.o | ||
| 539 | #ifdef GNUSTEP | 538 | #ifdef GNUSTEP |
| 540 | emacsappsrc = ${srcdir}/../nextstep/GNUstep/Emacs.base | 539 | emacsappsrc = ${srcdir}/../nextstep/GNUstep/Emacs.base |
| 541 | emacsbindir = $(emacsapp) | 540 | emacsbindir = $(emacsapp) |
| @@ -580,7 +579,7 @@ obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ | |||
| 580 | SOME_MACHINE_OBJECTS = dosfns.o msdos.o \ | 579 | SOME_MACHINE_OBJECTS = dosfns.o msdos.o \ |
| 581 | xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ | 580 | xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ |
| 582 | mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \ | 581 | mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \ |
| 583 | nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o \ | 582 | nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \ |
| 584 | w32.o w32console.o w32fns.o w32heap.o w32inevt.o \ | 583 | w32.o w32console.o w32fns.o w32heap.o w32inevt.o \ |
| 585 | w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_DRIVERS) | 584 | w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_DRIVERS) |
| 586 | 585 | ||