Mercurial > emacs

comparison src/Makefile.in @ 108611:a32b146e01b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/Makefile.in (OLDXMENU): Move out of cpp section.
author Glenn Morris <rgm@gnu.org>
date Sat, 15 May 2010 15:15:49 -0700
parents 4cbe9b411630
children 60489ff8b450
comparison
equal deleted inserted replaced
108610:4cbe9b411630 108611:a32b146e01b5
170 170
171 ## Only used if HAVE_X11 && !USE_GTK. 171 ## Only used if HAVE_X11 && !USE_GTK.
172 ## really-lwlib if USE_X_TOOLKIT, else really-oldxmenu. 172 ## really-lwlib if USE_X_TOOLKIT, else really-oldxmenu.
173 OLDXMENU_TARGET=@OLDXMENU_TARGET@ 173 OLDXMENU_TARGET=@OLDXMENU_TARGET@
174 174
175 ## If !HAVE_X11 || USE_GTK, empty.
176 ## Else if USE_X_TOOLKIT, ${lwlibdir}liblw.a.
177 ## Else ${oldXMenudir}libXMenu11.a.
178 OLDXMENU=@OLDXMENU@
179
175 XMENU_OBJ=@XMENU_OBJ@ 180 XMENU_OBJ=@XMENU_OBJ@
176 XOBJ=@XOBJ@ 181 XOBJ=@XOBJ@
177 182
178 TOOLKIT_LIBW=@TOOLKIT_LIBW@ 183 TOOLKIT_LIBW=@TOOLKIT_LIBW@
179 184
291 .m.o: 296 .m.o:
292 #ifdef AUTO_DEPEND 297 #ifdef AUTO_DEPEND
293 @-test -d deps || mkdir deps 298 @-test -d deps || mkdir deps
294 #endif 299 #endif
295 $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $< 300 $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
296
297 /* If !HAVE_X11 || USE_GTK, empty.
298 Else if USE_X_TOOLKIT, ${lwlibdir}liblw.a.
299 Else ${oldXMenudir}libXMenu11.a. */
300 OLDXMENU=@OLDXMENU@
301 301
302 #ifdef HAVE_X_WINDOWS 302 #ifdef HAVE_X_WINDOWS
303 LIBXMENU=@LIBXMENU@ 303 LIBXMENU=@LIBXMENU@
304 LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) 304 LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
305 LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) 305 LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)