diff options
| -rw-r--r-- | admin/CPP-DEFINES | 3 | ||||
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 10 |
3 files changed, 10 insertions, 5 deletions
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index 1f42eeb9528..cffbcf95e80 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -22,6 +22,9 @@ NS_IMPL_GNUSTEP Compile support for GNUstep implementation of NS GUI API. NS_IMPL_COCOA Compile support for Cocoa (Apple) implementation of NS GUI API. HAVE_X11 Compile support for the X11 GUI. HAVE_X_WINDOWS Compile support for X Window system + (It looks like, nowadays, if HAVE_X11 is set, HAVE_X_WINDOWS must + be, and vice versa. At least, this is true for configure, and + msdos; not sure about nt.) USE_LUCID Use the Lucid toolkit for menus&scrollbars. Requires HAVE_X11. USE_MOTIF Use the Motif toolkit for menus&scrollbars. Requires HAVE_X11. USE_GTK Use the Gtk toolkit for menus&scrollbars. Requires HAVE_X11. diff --git a/src/ChangeLog b/src/ChangeLog index ff0dbddd641..1b1ea399210 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2010-05-15 Glenn Morris <rgm@gnu.org> + * Makefile.in: Simplify cpp conditional. + * Makefile.in (${ns_appdir}): Simplify using umask. * Makefile.in (${ns_appdir}): Remove references to CVS-related files. diff --git a/src/Makefile.in b/src/Makefile.in index e4f7f07521c..2dd7340f9f8 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -611,6 +611,7 @@ LIBES = $(LOADLIBES) $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \ all: emacs${EXEEXT} $(OTHER_FILES) +/* Does anyone ever pay attention to the load-path-shadows output here? */ emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp} #ifdef CANNOT_DUMP rm -f emacs${EXEEXT} @@ -664,8 +665,8 @@ temacs${EXEEXT}: $(LOCALCPP) $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} pr prefix-args${EXEEXT}: prefix-args.o $(config_h) $(CC) $(LDFLAGS) prefix-args.o -o prefix-args -#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (USE_GTK) - +/* HAVE_X11 implies HAVE_X_WINDOWS and HAVE_MENUS. */ +#if defined (HAVE_X11) && ! defined (USE_GTK) /* We use stamp-xmenu with these two deps to both ensure that lwlib gets remade based on its dependencies in its own makefile, and remake temacs if lwlib gets changed by this. */ @@ -691,12 +692,12 @@ really-oldXMenu: @true /* make -t should not create really-oldXMenu. */ .PHONY: really-oldXMenu #endif /* not USE_X_TOOLKIT */ -#else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! USE_GTK) */ +#else /* !HAVE_X11 || USE_GTK */ /* We don''t really need this, but satisfy the dependency. */ stamp-oldxmenu: touch stamp-oldxmenu -#endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! USE_GTK) */ +#endif /* HAVE_X11 && !USE_GTK */ ../config.status:: epaths.in @echo "The file epaths.h needs to be set up from epaths.in." @@ -979,7 +980,6 @@ ${ns_appbindir}Emacs: emacs${EXEEXT} cp -f emacs${EXEEXT} ${ns_appbindir}Emacs ns-app: ${ns_appdir} ${ns_appbindir}Emacs - #endif /* HAVE_NS */ mostlyclean: |