Mercurial > emacs
diff src/Makefile.in @ 83456:de425e4eb0bc
Merged from miles@gnu.org--gnu-2005 (patch 182-184, 691-699)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-691
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-692
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-693
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-694
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-695
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-696
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-697
Checkout man/cc-mode.texi from CVS with RCS keywords disabled
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-698
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-699
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-182
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-183
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-184
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-496
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Tue, 17 Jan 2006 00:56:42 +0000 |
| parents | ec395f552d45 6962eb3cd807 |
| children | 7f469f3b6555 |
line wrap: on
line diff
--- a/src/Makefile.in Thu Jan 12 11:20:02 2006 +0000 +++ b/src/Makefile.in Tue Jan 17 00:56:42 2006 +0000 @@ -676,6 +676,20 @@ #define MSDOS_SUPPORT #endif +#ifdef HAVE_WINDOW_SYSTEM +#ifdef HAVE_X_WINDOWS +#define WINDOW_SUPPORT ${lispsource}image.elc \ + ${lispsource}international/fontset.elc ${lispsource}dnd.elc \ + ${lispsource}tool-bar.elc ${lispsource}mwheel.elc ${lispsource}x-dnd.elc +#else +#define WINDOW_SUPPORT ${lispsource}image.elc \ + ${lispsource}international/fontset.elc ${lispsource}dnd.elc \ + ${lispsource}tool-bar.elc ${lispsource}mwheel.elc +#endif +#else +#define WINDOW_SUPPORT +#endif + #ifdef WINDOWSNT #define WINNT_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \ ${lispsource}dos-w32.elc ${lispsource}w32-vars.elc \ @@ -794,6 +808,7 @@ VMS_SUPPORT \ MSDOS_SUPPORT \ WINNT_SUPPORT \ + WINDOW_SUPPORT \ ${lispsource}widget.elc \ ${lispsource}window.elc \ ${lispsource}version.el @@ -904,11 +919,14 @@ ${dotdot}/lisp/ls-lisp.elc ${dotdot}/lisp/dos-fns.elc \ ${dotdot}/lisp/w32-fns.elc ${dotdot}/lisp/dos-w32.elc \ ${dotdot}/lisp/disp-table.elc ${dotdot}/lisp/dos-vars.elc \ - ${dotdot}/lisp/tooltip.elc \ + ${dotdot}/lisp/tooltip.elc ${dotdot}/lisp/image.elc \ + ${dotdot}/lisp/dnd.elc ${dotdot}/lisp/mwheel.elc \ + ${dotdot}/lisp/tool-bar.elc \ + ${dotdot}/lisp/x-dnd.elc \ ${dotdot}/lisp/international/ccl.elc \ ${dotdot}/lisp/international/codepage.elc \ - ${dotdot}/lisp/mouse.elc ${dotdot}/lisp/international/fontset.elc \ - ${dotdot}/lisp/dnd.elc ${dotdot}/lisp/x-dnd.elc \ + ${dotdot}/lisp/international/fontset.elc + ${dotdot}/lisp/mouse.elc \ ${dotdot}/lisp/term/x-win.elc /* Construct full set of libraries to be linked.