[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104299: * src/Makefile.in (SOME_MACH
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104299: * src/Makefile.in (SOME_MACHINE_OBJECTS): Add some more files. |
Date: |
Fri, 20 May 2011 19:04:48 -0700 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104299
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2011-05-20 19:04:48 -0700
message:
* src/Makefile.in (SOME_MACHINE_OBJECTS): Add some more files.
modified:
src/ChangeLog
src/Makefile.in
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-05-21 02:02:42 +0000
+++ b/src/ChangeLog 2011-05-21 02:04:48 +0000
@@ -1,6 +1,8 @@
2011-05-21 Glenn Morris <address@hidden>
* 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 <address@hidden>
=== modified file 'src/Makefile.in'
--- a/src/Makefile.in 2011-05-21 02:02:42 +0000
+++ b/src/Makefile.in 2011-05-21 02:04:48 +0000
@@ -149,11 +149,13 @@
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.
address@hidden@
## -ltermcap, or -lncurses, or -lcurses, or "".
@@ -198,7 +200,10 @@
## Else $(OLDXMENU).
address@hidden@
+## xmenu.o if HAVE_X_WINDOWS, else empty.
address@hidden@
+## 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.
address@hidden@
address@hidden@
@@ -241,7 +246,9 @@
address@hidden@
address@hidden@
address@hidden@
+## fontset.o fringe.o image.o if HAVE_NS, else empty.
address@hidden@
+## nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o if HAVE_NS.
address@hidden@
## Only set if NS_IMPL_GNUSTEP.
address@hidden@
@@ -333,12 +340,16 @@
## 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.
address@hidden@
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104299: * src/Makefile.in (SOME_MACHINE_OBJECTS): Add some more files.,
Glenn Morris <=