aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1996-03-03 22:48:20 +0000
committerRichard M. Stallman1996-03-03 22:48:20 +0000
commitdddff3979fae799c9985cf6b66aaabd2f5104ef6 (patch)
tree6184db02542532bca73156bb9736ec94ceff70f7
parent1e659e4c3a05511479bc5376cd56178a95513824 (diff)
downloademacs-dddff3979fae799c9985cf6b66aaabd2f5104ef6.tar.gz
emacs-dddff3979fae799c9985cf6b66aaabd2f5104ef6.zip
(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
289#ifdef HAVE_MENUS 289#ifdef HAVE_MENUS
290 290
291/* Include xmenu.o in the list of X object files. */ 291/* Include xmenu.o in the list of X object files. */
292XOBJ= xterm.o xfns.o xfaces.o xmenu.o xselect.o xrdb.o 292XOBJ= xterm.o xfns.o xfaces.o xselect.o xrdb.o
293 293
294/* The X Menu stuff is present in the X10 distribution, but missing 294/* The X Menu stuff is present in the X10 distribution, but missing
295 from X11. If we have X10, just use the installed library; 295 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)
490 490
491 491
492/* lastfile must follow all files 492/* lastfile must follow all files
493 whose initialized data areas should be dumped as pure by dump-emacs. */ 493 whose initialized data areas should be dumped as pure by dump-emacs. */
494obj= dispnew.o frame.o scroll.o xdisp.o window.o \ 494obj= dispnew.o frame.o scroll.o xdisp.o xmenu.o window.o \
495 cm.o term.o $(XOBJ) \ 495 cm.o term.o $(XOBJ) \
496 emacs.o keyboard.o macros.o keymap.o sysdep.o \ 496 emacs.o keyboard.o macros.o keymap.o sysdep.o \
497 buffer.o filelock.o insdel.o marker.o INTERVAL_OBJ \ 497 buffer.o filelock.o insdel.o marker.o INTERVAL_OBJ \