Commit e20f1f07 authored by Glenn Morris's avatar Glenn Morris
Browse files

* src/Makefile.in (SHELL): Move outside cpp section.

Some comment formatting.
parent cb027b32
2010-05-14 Glenn Morris <rgm@gnu.org> 2010-05-14 Glenn Morris <rgm@gnu.org>
   
* Makefile.in (SHELL): Move outside cpp section.
* s/netbsd.h (AMPERSAND_FULL_NAME): Remove (defined in AH_BOTTOM). * s/netbsd.h (AMPERSAND_FULL_NAME): Remove (defined in AH_BOTTOM).
   
2010-05-13 Glenn Morris <rgm@gnu.org> 2010-05-13 Glenn Morris <rgm@gnu.org>
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
# Some of the conditionals might be dead now. Finding them and # Some of the conditionals might be dead now. Finding them and
# deleting them would be fine. # deleting them would be fine.
SHELL = /bin/sh
# Here are the things that we expect ../configure to edit. # Here are the things that we expect ../configure to edit.
# We use $(srcdir) explicitly in dependencies so as not to depend on VPATH. # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
...@@ -222,9 +223,6 @@ UNEXEC_OBJ = @unexec@ ...@@ -222,9 +223,6 @@ UNEXEC_OBJ = @unexec@
# ========================== start of cpp stuff ======================= # ========================== start of cpp stuff =======================
/* From here on, comments must be done in C syntax. */ /* 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 #define NOT_C_CODE
#include "config.h" #include "config.h"
...@@ -239,8 +237,7 @@ DEPFLAGS = -MMD -MF deps/$*.d ...@@ -239,8 +237,7 @@ DEPFLAGS = -MMD -MF deps/$*.d
/* Use HAVE_X11 as an alias for X11 in this file /* Use HAVE_X11 as an alias for X11 in this file
to avoid problems with X11 as a subdirectory name 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 #ifdef X11
#define HAVE_X11 #define HAVE_X11
#undef X11 #undef X11
...@@ -251,7 +248,7 @@ DEPFLAGS = -MMD -MF deps/$*.d ...@@ -251,7 +248,7 @@ DEPFLAGS = -MMD -MF deps/$*.d
#undef register #undef register
#ifdef NS_IMPL_GNUSTEP #ifdef NS_IMPL_GNUSTEP
/* Pull in stuff from GNUstep-make. */ /* Pull in stuff from GNUstep-make. */
FOUNDATION_LIB=gnu FOUNDATION_LIB=gnu
GUI_LIB=gnu GUI_LIB=gnu
include @GNUSTEP_MAKEFILES@/Additional/base.make include @GNUSTEP_MAKEFILES@/Additional/base.make
...@@ -262,7 +259,7 @@ shared=no ...@@ -262,7 +259,7 @@ shared=no
/* DO NOT use -R. There is a special hack described in lastfile.c /* DO NOT use -R. There is a special hack described in lastfile.c
which is used instead. Some initialized data areas are modified which is used instead. Some initialized data areas are modified
at initial startup, then labeled as part of the text area when 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 /* -Demacs is needed to make some files produce the correct version
for use in Emacs. for use in Emacs.
...@@ -372,8 +369,7 @@ obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ ...@@ -372,8 +369,7 @@ obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \
$(MSDOS_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_DRIVERS) $(MSDOS_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_DRIVERS)
/* Object files used on some machine or other. /* Object files used on some machine or other.
These go in the DOC file on all machines These go in the DOC file on all machines in case they are needed. */
in case they are needed there. */
SOME_MACHINE_OBJECTS = dosfns.o msdos.o \ SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
fontset.o dbusbind.o \ fontset.o dbusbind.o \
...@@ -713,9 +709,8 @@ prefix-args${EXEEXT}: prefix-args.o $(config_h) ...@@ -713,9 +709,8 @@ prefix-args${EXEEXT}: prefix-args.o $(config_h)
#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (USE_GTK) #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (USE_GTK)
/* We use stamp-xmenu with these two deps /* We use stamp-xmenu with these two deps to both ensure that lwlib
to both ensure that lwlib gets remade based on its dependencies gets remade based on its dependencies in its own makefile,
in its own makefile,
and remake temacs if lwlib gets changed by this. */ and remake temacs if lwlib gets changed by this. */
stamp-oldxmenu: ${OLDXMENU} ../src/$(OLDXMENU) stamp-oldxmenu: ${OLDXMENU} ../src/$(OLDXMENU)
touch stamp-oldxmenu touch stamp-oldxmenu
...@@ -978,8 +973,8 @@ xsmfns.o: xsmfns.c lisp.h $(config_h) systime.h sysselect.h termhooks.h xterm.h ...@@ -978,8 +973,8 @@ xsmfns.o: xsmfns.c lisp.h $(config_h) systime.h sysselect.h termhooks.h xterm.h
xsettings.o: xterm.h xsettings.h lisp.h frame.h termhooks.h $(config_h) \ 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 \ dispextern.h keyboard.h systime.h coding.h composite.h blockinput.h atimer.h \
termopts.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 \ 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) \ keyboard.h blockinput.h atimer.h systime.h character.h lisp.h $(config_h) \
$(INTERVALS_H) termhooks.h $(INTERVALS_H) termhooks.h
...@@ -1001,7 +996,7 @@ lread.o: lread.c commands.h keyboard.h buffer.h epaths.h character.h \ ...@@ -1001,7 +996,7 @@ lread.o: lread.c commands.h keyboard.h buffer.h epaths.h character.h \
charset.h lisp.h $(config_h) $(INTERVALS_H) termhooks.h coding.h msdos.h \ charset.h lisp.h $(config_h) $(INTERVALS_H) termhooks.h coding.h msdos.h \
systime.h frame.h blockinput.h atimer.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 \ 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) frame.h termhooks.h $(INTERVALS_H) window.h lisp.h $(config_h)
intervals.o: intervals.c buffer.h $(INTERVALS_H) keyboard.h puresize.h \ intervals.o: intervals.c buffer.h $(INTERVALS_H) keyboard.h puresize.h \
...@@ -1012,8 +1007,7 @@ textprop.o: textprop.c buffer.h window.h $(INTERVALS_H) \ ...@@ -1012,8 +1007,7 @@ textprop.o: textprop.c buffer.h window.h $(INTERVALS_H) \
#endif /* ! AUTO_DEPEND */ #endif /* ! AUTO_DEPEND */
/* System-specific programs to be made. /* System-specific programs to be made.
OTHER_FILES OTHER_FILES select which of these should be compiled. */
select which of these should be compiled. */
#ifdef HAVE_NS #ifdef HAVE_NS
${ns_appdir}: ${ns_appsrc} ${ns_appdir}: ${ns_appsrc}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment