aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile.in
diff options
context:
space:
mode:
authorAdrian Robert2008-07-15 18:35:28 +0000
committerAdrian Robert2008-07-15 18:35:28 +0000
commita68fda4a8c814ca368fc6d6b9549700c1d1c764a (patch)
tree47b55090da1c08af2737a672c5a0e99cb3528562 /src/Makefile.in
parentedfda78355c5528eee489fa8a7f9c73bf8e734f2 (diff)
downloademacs-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.in3
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/
535NS_OBJ= nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \ 535NS_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
537emacsapp = $(PWD)/../nextstep/build/Emacs.app/ 537emacsapp = $(PWD)/../nextstep/build/Emacs.app/
538FONT_DRIVERS = nsfont.o
539#ifdef GNUSTEP 538#ifdef GNUSTEP
540emacsappsrc = ${srcdir}/../nextstep/GNUstep/Emacs.base 539emacsappsrc = ${srcdir}/../nextstep/GNUstep/Emacs.base
541emacsbindir = $(emacsapp) 540emacsbindir = $(emacsapp)
@@ -580,7 +579,7 @@ obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \
580SOME_MACHINE_OBJECTS = dosfns.o msdos.o \ 579SOME_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