Mercurial > hg > xemacs-beta
diff 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 |
line wrap: on
line diff
--- a/src/Makefile.in.in Wed Feb 03 21:06:14 2010 -0600 +++ b/src/Makefile.in.in Wed Feb 03 21:46:21 2010 -0600 @@ -132,13 +132,13 @@ #ifdef HAVE_X_WINDOWS x_objs=console-x.o device-x.o event-Xt.o frame-x.o \ - glyphs-x.o objects-x.o redisplay-x.o select-x.o xgccache.o intl-x.o -#ifdef USE_XFT + glyphs-x.o objects-x.o redisplay-x.o select-x.o gccache-x.o intl-x.o +#ifdef HAVE_XFT x_objs += font-mgr.o #endif x_gui_objs=$(gui_objs:.o=-x.o) #ifdef HAVE_TOOLBARS -x_gui_objs += toolbar-common.o +x_gui_objs += toolbar-xlike.o #endif #endif @@ -159,7 +159,7 @@ gtk-xemacs.o ui-gtk.o gtk_gui_objs=$(gui_objs:.o=-gtk.o) #ifdef HAVE_TOOLBARS -gtk_gui_objs += toolbar-common.o +gtk_gui_objs += toolbar-xlike.o #endif #endif