Mercurial > hg > xemacs-beta
comparison src/Makefile.in.in @ 4969:cbe181529c34
Automatic merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 03 Feb 2010 21:46:21 -0600 |
parents | e813cf16c015 fce43cb76a1c |
children | 14f0dd1fabdb 8b2f75cecb89 861f2601a38b |
comparison
equal
deleted
inserted
replaced
4968:4d35e52790f8 | 4969:cbe181529c34 |
---|---|
130 gui_objs += toolbar.o | 130 gui_objs += toolbar.o |
131 #endif | 131 #endif |
132 | 132 |
133 #ifdef HAVE_X_WINDOWS | 133 #ifdef HAVE_X_WINDOWS |
134 x_objs=console-x.o device-x.o event-Xt.o frame-x.o \ | 134 x_objs=console-x.o device-x.o event-Xt.o frame-x.o \ |
135 glyphs-x.o objects-x.o redisplay-x.o select-x.o xgccache.o intl-x.o | 135 glyphs-x.o objects-x.o redisplay-x.o select-x.o gccache-x.o intl-x.o |
136 #ifdef USE_XFT | 136 #ifdef HAVE_XFT |
137 x_objs += font-mgr.o | 137 x_objs += font-mgr.o |
138 #endif | 138 #endif |
139 x_gui_objs=$(gui_objs:.o=-x.o) | 139 x_gui_objs=$(gui_objs:.o=-x.o) |
140 #ifdef HAVE_TOOLBARS | 140 #ifdef HAVE_TOOLBARS |
141 x_gui_objs += toolbar-common.o | 141 x_gui_objs += toolbar-xlike.o |
142 #endif | 142 #endif |
143 #endif | 143 #endif |
144 | 144 |
145 #ifdef HAVE_MS_WINDOWS | 145 #ifdef HAVE_MS_WINDOWS |
146 mswindows_objs=console-msw.o device-msw.o event-msw.o frame-msw.o \ | 146 mswindows_objs=console-msw.o device-msw.o event-msw.o frame-msw.o \ |
157 gtk_objs=console-gtk.o device-gtk.o event-gtk.o frame-gtk.o \ | 157 gtk_objs=console-gtk.o device-gtk.o event-gtk.o frame-gtk.o \ |
158 objects-gtk.o redisplay-gtk.o glyphs-gtk.o select-gtk.o gccache-gtk.o \ | 158 objects-gtk.o redisplay-gtk.o glyphs-gtk.o select-gtk.o gccache-gtk.o \ |
159 gtk-xemacs.o ui-gtk.o | 159 gtk-xemacs.o ui-gtk.o |
160 gtk_gui_objs=$(gui_objs:.o=-gtk.o) | 160 gtk_gui_objs=$(gui_objs:.o=-gtk.o) |
161 #ifdef HAVE_TOOLBARS | 161 #ifdef HAVE_TOOLBARS |
162 gtk_gui_objs += toolbar-common.o | 162 gtk_gui_objs += toolbar-xlike.o |
163 #endif | 163 #endif |
164 #endif | 164 #endif |
165 | 165 |
166 #ifdef HAVE_BALLOON_HELP | 166 #ifdef HAVE_BALLOON_HELP |
167 balloon_help_objs=balloon_help.o balloon-x.o | 167 balloon_help_objs=balloon_help.o balloon-x.o |