From: Glenn Morris Date: Sat, 21 May 2011 02:04:48 +0000 (-0700) Subject: * src/Makefile.in (SOME_MACHINE_OBJECTS): Add some more files. X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~229 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=33cf345f0c6ba2ff6422e773bc94e17125e60340;p=emacs.git * src/Makefile.in (SOME_MACHINE_OBJECTS): Add some more files. --- diff --git a/src/ChangeLog b/src/ChangeLog index 0d070a158a2..feed5157c8a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,6 +1,8 @@ 2011-05-21 Glenn Morris * Makefile.in ($(etc)/DOC): Make second command line even shorter. + (SOME_MACHINE_OBJECTS): Replace FONT_OBJ by its maximal expansion, + and add some more files. 2011-05-20 Eli Zaretskii diff --git a/src/Makefile.in b/src/Makefile.in index eb80652516e..c4250b90633 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -149,11 +149,13 @@ M17N_FLT_LIBS = @M17N_FLT_LIBS@ DBUS_CFLAGS = @DBUS_CFLAGS@ DBUS_LIBS = @DBUS_LIBS@ +## dbusbind.o if HAVE_DBUS, else empty. DBUS_OBJ = @DBUS_OBJ@ GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_LIBS = @GCONF_LIBS@ +## gtkutil.o if USE_GTK, else empty. GTK_OBJ=@GTK_OBJ@ ## -ltermcap, or -lncurses, or -lcurses, or "". @@ -198,7 +200,10 @@ OLDXMENU_DEPS=@OLDXMENU_DEPS@ ## Else $(OLDXMENU). LIBXMENU=@LIBXMENU@ +## xmenu.o if HAVE_X_WINDOWS, else empty. XMENU_OBJ=@XMENU_OBJ@ +## xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o +## xsettings.o xgselect.o if HAVE_X_WINDOWS, else empty. XOBJ=@XOBJ@ TOOLKIT_LIBW=@TOOLKIT_LIBW@ @@ -241,7 +246,9 @@ MSDOS_X_OBJ = ns_appdir=@ns_appdir@ ns_appbindir=@ns_appbindir@ ns_appsrc=@ns_appsrc@ +## fontset.o fringe.o image.o if HAVE_NS, else empty. NS_OBJ=@NS_OBJ@ +## nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o if HAVE_NS. NS_OBJC_OBJ=@NS_OBJC_OBJ@ ## Only set if NS_IMPL_GNUSTEP. GNU_OBJC_CFLAGS=@GNU_OBJC_CFLAGS@ @@ -333,12 +340,16 @@ obj = $(base_obj) $(NS_OBJC_OBJ) ## Object files used on some machine or other. ## These go in the DOC file on all machines in case they are needed. +## Some of them have no DOC entries, but it does no harm to have them +## in the list, in case they ever add any such entries. SOME_MACHINE_OBJECTS = dosfns.o msdos.o \ xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ fontset.o dbusbind.o \ nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \ w32.o w32console.o w32fns.o w32heap.o w32inevt.o \ - w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_OBJ) + w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \ + w16select.o widget.o xfont.o ftfont.o xftfont.o ftxfont.o gtkutil.o \ + xsettings.o xgselect.o termcap.o ## gmalloc.o if !SYSTEM_MALLOC && !DOUG_LEA_MALLOC, else empty. GMALLOC_OBJ=@GMALLOC_OBJ@