# You should have received a copy of the GNU General Public License
# along with GNU Emacs; see the file COPYING. If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
# Here are the things that we expect ../configure to edit.
srcdir=@srcdir@
S_FILE = ${srcdir}/@opsysfile@
config_h = config.h $(M_FILE) $(S_FILE)
-# ========================== start of cpp stuff ======================= */
+# ========================== start of cpp stuff =======================
/* From here on, comments must be done in C syntax. */
CPPFLAGS=
#define LIBS_DEBUG -lg
#endif
-/* Some s/*.h files define this to request special libraries. */
+/* Some s/SYSTEM.h files define this to request special libraries. */
#ifndef LIBS_SYSTEM
#define LIBS_SYSTEM
#endif
-/* Some m/*.h files define this to request special libraries. */
+/* Some m/MACHINE.h files define this to request special libraries. */
#ifndef LIBS_MACHINE
#define LIBS_MACHINE
#endif
# endif /* ! defined (LISP_FLOAT_TYPE) */
#endif /* LIB_MATH */
-/* Some s/*.h files define this to request special switches in ld. */
+/* Some s/SYSTEM.h files define this to request special switches in ld. */
#ifndef LD_SWITCH_SYSTEM
#if !defined (__GNUC__) && (defined(COFF_ENCAPSULATE) || (defined (BSD) && !defined (COFF)))
#define LD_SWITCH_SYSTEM -X
#endif /* ! defined(COFF_ENCAPSULATE) || (defined (BSD) && !defined (COFF)) */
#endif /* LD_SWITCH_SYSTEM */
-/* Some m/*.h files define this to request special switches in ld. */
+/* Some m/MACHINE.h files define this to request special switches in ld. */
#ifndef LD_SWITCH_MACHINE
#define LD_SWITCH_MACHINE
#endif
-/* Some m/*.h files define this to request special switches in cc. */
+/* Some m/MACHINE.h files define this to request special switches in cc. */
#ifndef C_SWITCH_MACHINE
#define C_SWITCH_MACHINE
#endif
-/* Some s/*.h files define this to request special switches in cc. */
+/* Some s/SYSTEM.h files define this to request special switches in cc. */
#ifndef C_SWITCH_SYSTEM
#define C_SWITCH_SYSTEM
#endif
which will be in a file named localcpp. */
MYCPPFLAG= -Blocal
/* LOCALCPP is the local one or nothing.
- CPP is the local one or the standardone. */
+ CPP is the local one or the standard one. */
LOCALCPP= localcpp
#endif /* ! defined (LONGNAMEBBBARFOOX) */
#ifdef HAVE_MENUS
/* Include xmenu.o in the list of X object files. */
-XOBJ= xterm.o xfns.o xfaces.o xmenu.o xselect.o xrdb.o
+XOBJ= xterm.o xfns.o xfaces.o xselect.o xrdb.o
/* The X Menu stuff is present in the X10 distribution, but missing
from X11. If we have X10, just use the installed library;
#ifdef HAVE_X_WINDOWS
#define MSDOS_OBJ dosfns.o msdos.o
#else
-#define MSDOS_OBJ dosfns.o msdos.o xfaces.o xmenu.o
+#define MSDOS_OBJ dosfns.o msdos.o xfaces.o
#endif
#else
#define MSDOS_OBJ
/* lastfile must follow all files
- whose initialized data areas should be dumped as pure by dump-emacs. */
-obj= dispnew.o frame.o scroll.o xdisp.o window.o \
+ whose initialized data areas should be dumped as pure by dump-emacs. */
+obj= dispnew.o frame.o scroll.o xdisp.o xmenu.o window.o \
cm.o term.o $(XOBJ) \
emacs.o keyboard.o macros.o keymap.o sysdep.o \
buffer.o filelock.o insdel.o marker.o INTERVAL_OBJ \
#ifdef TERMINFO
/* Used to be -ltermcap here. If your machine needs that,
- define LIBS_TERMCAP in the m/*.h file. */
+ define LIBS_TERMCAP in the m/MACHINE.h file. */
#ifndef LIBS_TERMCAP
#define LIBS_TERMCAP -lcurses
#endif /* LIBS_TERMCAP */
#endif
#ifdef MSDOS
-#define MSDOS_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-tab.elc ${lispsource}dos-fns.elc
+#define MSDOS_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \
+ ${lispsource}dos-fns.elc ${lispsource}dos-nt.elc
#else
#define MSDOS_SUPPORT
#endif
#ifdef WINDOWSNT
-#define WINNT_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}winnt.elc
+#define WINNT_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}winnt.elc \
+ ${lispsource}dos-nt.elc
#else
#define WINNT_SUPPORT
#endif
${dotdot}/lisp/select.elc ${dotdot}/lisp/scroll-bar.elc \
${dotdot}/lisp/vmsproc.elc ${dotdot}/lisp/vms-patch.elc \
${dotdot}/lisp/ls-lisp.elc ${dotdot}/lisp/dos-fns.elc \
- ${dotdot}/lisp/winnt.elc
+ ${dotdot}/lisp/winnt.elc ${dotdot}/lisp/dos-nt.elc
/* Construct full set of libraries to be linked.
Note that SunOS needs -lm to come before -lc; otherwise, you get
#define LWLIB_OPTIONS
#endif
-#ifdef HAVE_X_WINDOWS
-#ifdef HAVE_X11
+#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS)
+
#ifdef USE_X_TOOLKIT
$(OLDXMENU): really-lwlib
@true /* make -t should not create really-lwlib. */
.PHONY: really-lwlib
#else /* not USE_X_TOOLKIT */
-#ifdef HAVE_MENUS
$(OLDXMENU): really-oldXMenu
/* Encode the values of these two macros in Make variables,
"C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)"
@true /* make -t should not create really-oldXMenu. */
.PHONY: really-oldXMenu
-#endif /* HAVE_MENUS */
#endif /* not USE_X_TOOLKIT */
-#endif /* HAVE_X11 */
-#endif /* HAVE_X_WINDOWS */
+#endif /* HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS */
-paths.h: paths.in
+../config.status:: paths.in
@echo "The file paths.h needs to be set up from paths.in."
- @echo "Consult the file \`INSTALL' for instructions for building Emacs."
+ @echo "Please run the `configure' script again."
exit 1
-config.h: config.in
+../config.status:: config.in
@echo "The file config.h needs to be set up from config.in."
- @echo "Consult the file \`INSTALL' for instructions for building Emacs."
+ @echo "Please run the `configure' script again."
exit 1
/* Some machines have alloca built-in.
dired.o: dired.c commands.h buffer.h $(config_h) regex.h
dispnew.o: dispnew.c commands.h frame.h window.h buffer.h dispextern.h \
termchar.h termopts.h termhooks.h cm.h disptab.h systty.h systime.h \
- xterm.h $(config_h)
+ xterm.h blockinput.h $(config_h)
doc.o: doc.c $(config_h) paths.h buffer.h keyboard.h
doprnt.o: doprnt.c $(config_h)
dosfns.o: buffer.h termchar.h termhooks.h frame.h msdos.h dosfns.h $(config_h)
editfns.o: editfns.c window.h buffer.h systime.h INTERVAL_SRC $(config_h)
-emacs.o: emacs.c commands.h systty.h syssignal.h process.h INTERVAL_SRC $(config_h)
+emacs.o: emacs.c commands.h systty.h syssignal.h blockinput.h process.h \
+ INTERVAL_SRC $(config_h)
fileio.o: fileio.c window.h buffer.h systime.h INTERVAL_SRC $(config_h)
filelock.o: filelock.c buffer.h paths.h $(config_h)
filemode.o: filemode.c $(config_h)
of UNEXEC when substituting it in. */
UNEXEC_ALIAS=UNEXEC
$(UNEXEC_ALIAS): UNEXEC_SRC $(config_h)
-widget.o: widget.c xterm.h frame.h dispextern.h widgetprv.h $(config_h)
+widget.o: widget.c xterm.h frame.h dispextern.h widgetprv.h \
+ ../lwlib/lwlib.h $(config_h)
window.o: window.c indent.h commands.h frame.h window.h buffer.h termchar.h \
termhooks.h disptab.h keyboard.h $(config_h)
xdisp.o: xdisp.c macros.h commands.h indent.h buffer.h dispextern.h \
xfaces.o: xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h \
window.h $(config_h)
xfns.o: xfns.c buffer.h frame.h window.h keyboard.h xterm.h \
- blockinput.h paths.h $(config_h)
-xmenu.o: xmenu.c xterm.h window.h dispextern.h frame.h keyboard.h \
- blockinput.h puresize.h msdos.h $(config_h)
+ ../lwlib/lwlib.h blockinput.h paths.h $(config_h)
+xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h keyboard.h \
+ ../lwlib/lwlib.h blockinput.h puresize.h msdos.h $(config_h)
xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h \
dispextern.h frame.h disptab.h blockinput.h systime.h syssignal.h \
keyboard.h gnu.h sink.h sinkmask.h $(config_h)