aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2010-05-15 15:15:49 -0700
committerGlenn Morris2010-05-15 15:15:49 -0700
commitc0b0aed52007b3d735012376504e2db3691e0bc7 (patch)
treec7fdcebf6fd8923d46caf50bb0d991cc66b448c0 /src
parent3545021dd51a335e12e2e63bf69c59b611e5c615 (diff)
downloademacs-c0b0aed52007b3d735012376504e2db3691e0bc7.tar.gz
emacs-c0b0aed52007b3d735012376504e2db3691e0bc7.zip
src/Makefile.in (OLDXMENU): Move out of cpp section.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 50411c1b118..752a1f6d4e9 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -172,6 +172,11 @@ LIBXT_OTHER=@LIBXT_OTHER@
172## really-lwlib if USE_X_TOOLKIT, else really-oldxmenu. 172## really-lwlib if USE_X_TOOLKIT, else really-oldxmenu.
173OLDXMENU_TARGET=@OLDXMENU_TARGET@ 173OLDXMENU_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.
178OLDXMENU=@OLDXMENU@
179
175XMENU_OBJ=@XMENU_OBJ@ 180XMENU_OBJ=@XMENU_OBJ@
176XOBJ=@XOBJ@ 181XOBJ=@XOBJ@
177 182
@@ -294,11 +299,6 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS)
294#endif 299#endif
295 $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $< 300 $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
296 301
297/* If !HAVE_X11 || USE_GTK, empty.
298 Else if USE_X_TOOLKIT, ${lwlibdir}liblw.a.
299 Else ${oldXMenudir}libXMenu11.a. */
300OLDXMENU=@OLDXMENU@
301
302#ifdef HAVE_X_WINDOWS 302#ifdef HAVE_X_WINDOWS
303LIBXMENU=@LIBXMENU@ 303LIBXMENU=@LIBXMENU@
304LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) 304LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)