Mercurial > emacs
diff src/Makefile.in @ 95655:9a50a852d447
* Makefile.in (obj): Always add menu.o
* emacs.c (main): Always call syms_of_menu.
* keyboard.h: Remove extra #ifdef HAVE_X_WINDOW.
| author | Andreas Schwab <schwab@suse.de> |
|---|---|
| date | Sun, 08 Jun 2008 08:59:47 +0000 |
| parents | b7a3c725e25d |
| children | c4f5f8f64d1f |
line wrap: on
line diff
--- a/src/Makefile.in Sun Jun 08 07:54:25 2008 +0000 +++ b/src/Makefile.in Sun Jun 08 08:59:47 2008 +0000 @@ -539,13 +539,9 @@ #endif /* HAVE_X_WINDOWS */ #endif /* HAVE_WINDOW_SYSTEM */ -#ifdef HAVE_X_WINDOWS -MENU_OBJ = menu.o -#endif - /* 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 $(MENU_OBJ) $(XMENU_OBJ) window.o \ +obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ charset.o coding.o category.o ccl.o character.o chartab.o \ cm.o term.o terminal.o xfaces.o $(XOBJ) $(GTK_OBJ) $(DBUS_OBJ) \ emacs.o keyboard.o macros.o keymap.o sysdep.o \