[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100265: * src/Makefile.in (SHELL): M
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100265: * src/Makefile.in (SHELL): Move outside cpp section. |
Date: |
Thu, 13 May 2010 19:32:29 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100265
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2010-05-13 19:32:29 -0700
message:
* src/Makefile.in (SHELL): Move outside cpp section.
Some comment formatting.
modified:
src/ChangeLog
src/Makefile.in
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-05-14 02:28:28 +0000
+++ b/src/ChangeLog 2010-05-14 02:32:29 +0000
@@ -1,5 +1,7 @@
2010-05-14 Glenn Morris <address@hidden>
+ * Makefile.in (SHELL): Move outside cpp section.
+
* s/netbsd.h (AMPERSAND_FULL_NAME): Remove (defined in AH_BOTTOM).
2010-05-13 Glenn Morris <address@hidden>
=== modified file 'src/Makefile.in'
--- a/src/Makefile.in 2010-05-13 07:57:28 +0000
+++ b/src/Makefile.in 2010-05-14 02:32:29 +0000
@@ -30,6 +30,7 @@
# Some of the conditionals might be dead now. Finding them and
# deleting them would be fine.
+SHELL = /bin/sh
# Here are the things that we expect ../configure to edit.
# We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
@@ -222,9 +223,6 @@
# ========================== start of cpp stuff =======================
/* From here on, comments must be done in C syntax. */
-/* just to be sure the sh is used */
-SHELL=/bin/sh
-
#define NOT_C_CODE
#include "config.h"
@@ -239,8 +237,7 @@
/* Use HAVE_X11 as an alias for X11 in this file
to avoid problems with X11 as a subdirectory name
- in -I and other such options which pass through this file. */
-
+ in -I and other such options which pass through this file. */
#ifdef X11
#define HAVE_X11
#undef X11
@@ -251,7 +248,7 @@
#undef register
#ifdef NS_IMPL_GNUSTEP
-/* Pull in stuff from GNUstep-make. */
+/* Pull in stuff from GNUstep-make. */
FOUNDATION_LIB=gnu
GUI_LIB=gnu
include @GNUSTEP_MAKEFILES@/Additional/base.make
@@ -262,7 +259,7 @@
/* DO NOT use -R. There is a special hack described in lastfile.c
which is used instead. Some initialized data areas are modified
at initial startup, then labeled as part of the text area when
- Emacs is dumped for the first time, and never changed again. */
+ Emacs is dumped for the first time, and never changed again. */
/* -Demacs is needed to make some files produce the correct version
for use in Emacs.
@@ -372,8 +369,7 @@
$(MSDOS_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_DRIVERS)
/* Object files used on some machine or other.
- These go in the DOC file on all machines
- in case they are needed there. */
+ These go in the DOC file on all machines in case they are needed. */
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 \
@@ -713,9 +709,8 @@
#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) &&
! 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,
+/* 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. */
stamp-oldxmenu: ${OLDXMENU} ../src/$(OLDXMENU)
touch stamp-oldxmenu
@@ -978,8 +973,8 @@
xsettings.o: xterm.h xsettings.h lisp.h frame.h termhooks.h $(config_h) \
dispextern.h keyboard.h systime.h coding.h composite.h blockinput.h atimer.h
\
termopts.h
-/* The files of Lisp proper */
+/* The files of Lisp proper. */
alloc.o: alloc.c process.h frame.h window.h buffer.h puresize.h syssignal.h \
keyboard.h blockinput.h atimer.h systime.h character.h lisp.h $(config_h) \
$(INTERVALS_H) termhooks.h
@@ -1001,7 +996,7 @@
charset.h lisp.h $(config_h) $(INTERVALS_H) termhooks.h coding.h msdos.h \
systime.h frame.h blockinput.h atimer.h
-/* Text properties support */
+/* Text properties support. */
composite.o: composite.c buffer.h character.h coding.h font.h ccl.h \
frame.h termhooks.h $(INTERVALS_H) window.h lisp.h $(config_h)
intervals.o: intervals.c buffer.h $(INTERVALS_H) keyboard.h puresize.h \
@@ -1012,8 +1007,7 @@
#endif /* ! AUTO_DEPEND */
/* System-specific programs to be made.
- OTHER_FILES
- select which of these should be compiled. */
+ OTHER_FILES select which of these should be compiled. */
#ifdef HAVE_NS
${ns_appdir}: ${ns_appsrc}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100265: * src/Makefile.in (SHELL): Move outside cpp section.,
Glenn Morris <=