diff options
| author | Glenn Morris <rgm@gnu.org> | 2009-09-26 19:40:55 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2009-09-26 19:40:55 +0000 |
| commit | b7d552d615d3bab75a7d03c97ba81323d3630484 (patch) | |
| tree | 6b898c7b33e61d7c2668a363fe6809b843f67f8e /src/Makefile.in | |
| parent | 1861d81ed36e8397e14ad7868e247940d4ac8cfa (diff) | |
| download | emacs-b7d552d615d3bab75a7d03c97ba81323d3630484.tar.gz | |
(MSDOS_SUPPORT) [MSDOS]: Remove unneeded '/' in internal.elc.
Add term/pc-win.elc.
(WINDOW_SUPPORT) [HAVE_X_WINDOWS]: Add term/common-win.elc and term/x-win.elc.
(WINNT_SUPPORT) [WINDOWSNT]: Add term/common-win.elc and term/w32-win.elc.
(NS_SUPPORT): New.
(lisp): Add NS_SUPPORT.
(SOME_MACHINE_LISP): Add term/w32-win.elc and emacs-lisp/easymenu.elc.
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 39c58102a35..493e9b21a4c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -631,7 +631,7 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(widgetobj) $(LIBOBJS) #ifdef MSDOS #define MSDOS_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \ ${lispsource}dos-fns.elc ${lispsource}dos-w32.elc ${lispsource}dos-vars.elc \ - ${lispsource}/term/internal.elc + ${lispsource}term/internal.elc ${lispsource}term/pc-win.elc #else #define MSDOS_SUPPORT @@ -641,7 +641,8 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(widgetobj) $(LIBOBJS) #ifdef HAVE_X_WINDOWS #define WINDOW_SUPPORT ${lispsource}fringe.elc ${lispsource}image.elc \ ${lispsource}international/fontset.elc ${lispsource}dnd.elc \ - ${lispsource}tool-bar.elc ${lispsource}mwheel.elc ${lispsource}x-dnd.elc + ${lispsource}tool-bar.elc ${lispsource}mwheel.elc ${lispsource}x-dnd.elc \ + ${lispsource}term/common-win.elc ${lispsource}term/x-win.elc #else #define WINDOW_SUPPORT ${lispsource}fringe.elc ${lispsource}image.elc \ ${lispsource}international/fontset.elc ${lispsource}dnd.elc \ @@ -654,7 +655,8 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(widgetobj) $(LIBOBJS) #ifdef WINDOWSNT #define WINNT_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \ ${lispsource}dos-w32.elc ${lispsource}w32-vars.elc \ - ${lispsource}w32-fns.elc + ${lispsource}w32-fns.elc ${lispsource}term/common-win.elc \ + ${lispsource}term/w32-win.elc #else #define WINNT_SUPPORT #endif @@ -665,6 +667,13 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(widgetobj) $(LIBOBJS) #define TOOLTIP_SUPPORT #endif +#ifdef HAVE_NS +#define NS_SUPPORT ${lispsource}emacs-lisp/easymenu.elc \ + ${lispsource}term/ns-win.elc +#else +#define NS_SUPPORT +#endif + /* List of Lisp files loaded into the dumped Emacs. It is arranged like this because it is easier to generate it semi-mechanically from loadup.el this way. @@ -765,6 +774,7 @@ lisp= \ MSDOS_SUPPORT \ WINNT_SUPPORT \ WINDOW_SUPPORT \ + NS_SUPPORT \ ${lispsource}widget.elc \ ${lispsource}window.elc \ ${lispsource}version.el @@ -876,7 +886,8 @@ SOME_MACHINE_LISP = ../lisp/mouse.elc \ ../lisp/term/common-win.elc \ ../lisp/term/x-win.elc \ ../lisp/term/pc-win.elc ../lisp/term/internal.elc \ - ../lisp/term/ns-win.elc + ../lisp/term/ns-win.elc ../lisp/term/w32-win.elc \ + ../lisp/emacs-lisp/easymenu.elc /* Construct full set of libraries to be linked. Note that SunOS needs -lm to come before -lc; otherwise, you get |