summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1996-03-03 22:48:20 +0000
committerRichard M. Stallman <rms@gnu.org>1996-03-03 22:48:20 +0000
commitc5ff51a8b6c63acfc6c81fecf3bc48200f2d1572 (patch)
treeb385c1c1d3c0869b3dd028b19ade6489872c7243
parent2a2a49ef6d6b37fdf7bdcf0a6d154e972601701e (diff)
downloademacs-c5ff51a8b6c63acfc6c81fecf3bc48200f2d1572.tar.gz
(obj): Add xmenu.o.
(XOBJ): Delete xmenu.o.
-rw-r--r--src/Makefile.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index d2b925118da..b0e6f8bd7fe 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -289,7 +289,7 @@ ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAG) -I. -I${srcdi
#ifdef HAVE_MENUS
/* Include xmenu.o in the list of X object files. */
-XOBJ= xterm.o xfns.o xfaces.o xmenu.o xselect.o xrdb.o
+XOBJ= xterm.o xfns.o xfaces.o xselect.o xrdb.o
/* The X Menu stuff is present in the X10 distribution, but missing
from X11. If we have X10, just use the installed library;
@@ -490,8 +490,8 @@ ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_MACHINE LD_SWITCH_SITE $(LDFLAGS)
/* lastfile must follow all files
- whose initialized data areas should be dumped as pure by dump-emacs. */
-obj= dispnew.o frame.o scroll.o xdisp.o window.o \
+ whose initialized data areas should be dumped as pure by dump-emacs. */
+obj= dispnew.o frame.o scroll.o xdisp.o xmenu.o window.o \
cm.o term.o $(XOBJ) \
emacs.o keyboard.o macros.o keymap.o sysdep.o \
buffer.o filelock.o insdel.o marker.o INTERVAL_OBJ \