comparison src/Makefile.in @ 65541:418933eb8310

(XMENU_OBJ): Variable deleted. (obj): Use xmenu.o unconditionally. (SOME_MACHINE_OBJECTS): Delete xmenu.o.

65540:1723cdcfeac6

XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o

#ifdef HAVE_MENUS

#ifndef HAVE_CARBON
XMENU_OBJ = xmenu.o
#endif

#ifdef USE_GTK
GTK_OBJ= gtkutil.o
#endif

/* The X Menu stuff is present in the X10 distribution, but missing

LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM
#else /* not HAVE_X11 */
LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM
#endif /* not HAVE_X11 */
#else /* not HAVE_X_WINDOWS */
#if defined(HAVE_MENUS) && !defined(HAVE_CARBON)
XMENU_OBJ = xmenu.o
#endif
#endif /* not HAVE_X_WINDOWS */

LIBSOUND= @LIBSOUND@

#ifndef ORDINARY_LINK

emacsappsrc = ${srcdir}/../mac/Emacs.app/
#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 $(XMENU_OBJ) window.o \
	charset.o coding.o category.o ccl.o \
	cm.o term.o xfaces.o $(XOBJ) $(GTK_OBJ)\
	emacs.o keyboard.o macros.o keymap.o sysdep.o \
	buffer.o filelock.o insdel.o marker.o \
	minibuf.o fileio.o dired.o filemode.o \

/* Object files used on some machine or other.
   These go in the DOC file on all machines
   in case they are needed there.  */
SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o \
  xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
  mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \
  w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \
  w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o

65541:418933eb8310

XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o

#ifdef HAVE_MENUS

#ifdef USE_GTK
GTK_OBJ= gtkutil.o
#endif

/* The X Menu stuff is present in the X10 distribution, but missing

LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM
#else /* not HAVE_X11 */
LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM
#endif /* not HAVE_X11 */
#else /* not HAVE_X_WINDOWS */
#endif /* not HAVE_X_WINDOWS */

LIBSOUND= @LIBSOUND@

#ifndef ORDINARY_LINK

emacsappsrc = ${srcdir}/../mac/Emacs.app/
#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 xmenu.o window.o \
	charset.o coding.o category.o ccl.o \
	cm.o term.o xfaces.o $(XOBJ) $(GTK_OBJ)\
	emacs.o keyboard.o macros.o keymap.o sysdep.o \
	buffer.o filelock.o insdel.o marker.o \
	minibuf.o fileio.o dired.o filemode.o \

/* Object files used on some machine or other.
   These go in the DOC file on all machines
   in case they are needed there.  */
SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o \
  xterm.o xfns.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
  mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \
  w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \
  w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o