X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/ab8fbbf707c90e5f82ec5a04c955067211f613b5..8a1bbe07a8148ac73f77fd47ad256bf55214f83b:/src/Makefile.in diff --git a/src/Makefile.in b/src/Makefile.in index 12c24fa118..d1f699d979 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,38 +1,34 @@ -/* Makefile for GNU Emacs. - Copyright (C) 1985, 1987, 1988, 1993 Free Software Foundation, Inc. +# Makefile for GNU Emacs. +# Copyright (C) 1985, 1987, 1988, 1993, 1994 Free Software Foundation, Inc. -This file is part of GNU Emacs. +# This file is part of GNU Emacs. -GNU Emacs is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. +# GNU Emacs is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. -GNU Emacs is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +# GNU Emacs is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. -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. */ +# 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. */ -/* BSD doesn't have it as a default. */ -MAKE = make - -/* Here are the things that we expect ../configure to edit. */ +# Here are the things that we expect ../configure to edit. srcdir=@srcdir@ VPATH=@srcdir@ CC=@CC@ CPP=@CPP@ CFLAGS=@CFLAGS@ -C_SWITCH_SYSTEM= LN_S=@LN_S@ -# These escaped doublequotes become part of the macro definition in emacs.c. -# Thus, the definition is a C string constant. -configuration=\"@configuration@\" +# Substitute an assignment for the MAKE variable, because +# BSD doesn't have it as a default. +@SET_MAKE@ -/* On Xenix and the IBM RS6000, double-dot gets screwed up. */ +# On Xenix and the IBM RS6000, double-dot gets screwed up. dot = . lispdir = ${srcdir}/$(dot)$(dot)/lisp/ libsrc = $(dot)$(dot)/lib-src/ @@ -40,7 +36,19 @@ etc = $(dot)$(dot)/etc/ shortnamesdir = $(dot)$(dot)/shortnames/ cppdir = $(dot)$(dot)/cpp/ oldXMenudir = $(dot)$(dot)/oldXMenu/ -config_h = config.h +lwlibdir = $(dot)$(dot)/lwlib/ + +# Configuration files for .o files to depend on. +M_FILE = ${srcdir}/@machfile@ +S_FILE = ${srcdir}/@opsysfile@ +config_h = config.h $(M_FILE) $(S_FILE) + +# ========================== start of cpp stuff ======================= */ +/* From here on, comments must be done in C syntax. */ + +CPPFLAGS= +LDFLAGS= +C_SWITCH_SYSTEM= /* just to be sure the sh is used */ SHELL=/bin/sh @@ -66,14 +74,20 @@ SHELL=/bin/sh /* On some systems we may not be able to use the system make command. */ #ifdef MAKE_COMMAND MAKE = MAKE_COMMAND -#else -MAKE=make #endif #ifdef C_COMPILER CC = C_COMPILER #endif +/* GNU libc requires ORDINARY_LINK so that its own crt0 is used. + Linux is an exception because it uses a funny variant of GNU libc. */ +#ifdef __GNU_LIBRARY__ +#ifndef LINUX +#define ORDINARY_LINK +#endif +#endif + /* Some machines don't find the standard C libraries in the usual place. */ #ifndef ORDINARY_LINK #ifndef LIB_STANDARD @@ -220,9 +234,6 @@ SHORT= shortnames at initial startup, then labeled as part of the text area when Emacs is dumped for the first time, and never changed again. */ -/* If you want to debug, you can add C_DEBUG_SWITCH to this list. - If you want to optimize, you can add C_OPTIMIZE_SWITCH to the list. */ - /* -Demacs is needed to make some files produce the correct version for use in Emacs. @@ -265,26 +276,56 @@ XOBJ= xterm.o xfns.o xfaces.o xmenu.o xselect.o xrdb.o from X11. If we have X10, just use the installed library; otherwise, use our own copy. */ #ifdef HAVE_X11 +#ifdef USE_X_TOOLKIT +OLDXMENU=liblw.a +LIBXMENU= $(OLDXMENU) +#else /* not USE_X_TOOLKIT */ OLDXMENU= libXMenu11.a LIBXMENU= $(OLDXMENU) -#else /* ! defined (HAVE_X11) */ +#endif /* not USE_X_TOOLKIT */ +#else /* not HAVE_X11 */ LIBXMENU= -lXMenu -#endif /* ! defined (HAVE_X11) */ +#endif /* not HAVE_X11 */ -#else /* ! defined (HAVE_X_MENU) */ +#else /* not HAVE_X_MENU */ /* Otherwise, omit xmenu.o from the list of X object files, and don't worry about the menu library at all. */ XOBJ= xterm.o xfns.o xfaces.o xselect.o xrdb.o LIBXMENU= -#endif /* ! defined (HAVE_X_MENU) */ +#endif /* not HAVE_X_MENU */ + +#ifdef USE_X_TOOLKIT +#define @X_TOOLKIT_TYPE@ +#if defined (LUCID) || defined (ATHENA) +LIBW= -lXaw +#endif +#ifdef MOTIF +#ifdef LIB_MOTIF +LIBW= LIB_MOTIF +#else +LIBW= -lXm +#endif +#endif +#ifdef OPEN_LOOK +LIBW= -lXol +#endif + +#ifdef HAVE_X11XTR6 +LIBXTR6 = -lSM -lICE +#endif + +LIBXT= $(LIBW) -lXt $(LIBXTR6) -lXmu -lXext +#else +LIBXT= +#endif #ifdef HAVE_X11 -LIBX= $(LIBXMENU) LD_SWITCH_X_SITE LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM -#else /* ! defined (HAVE_X11) */ +LIBX= $(LIBXMENU) LD_SWITCH_X_SITE $(LIBXT) LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM +#else /* not HAVE_X11 */ LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM -#endif /* ! defined (HAVE_X11) */ -#endif /* ! defined (HAVE_X_WINDOWS) */ +#endif /* not HAVE_X11 */ +#endif /* not HAVE_X_WINDOWS */ #ifndef ORDINARY_LINK /* Fix linking if compiled with GCC. */ @@ -312,7 +353,7 @@ LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM #ifndef LIB_GCC /* Ask GCC where to find libgcc.a. */ #define LIB_GCC `$(CC) -print-libgcc-file-name` -#endif /* LIB_GCC */ +#endif /* not LIB_GCC */ GNULIB_VAR = LIB_GCC @@ -331,13 +372,13 @@ GNULIB_VAR = LIB_GCC #ifndef LIB_GCC #define LIB_GCC /usr/local/lib/gcc-gnulib -#endif /* LIB_GCC */ +#endif /* not LIB_GCC */ GNULIB_VAR = `if [ -f LIB_GCC ] ; then echo LIB_GCC; else echo; fi` #endif /* __GNUC__ < 2 */ -#else /* ! defined (__GNUC__) */ +#else /* not __GNUC__ */ GNULIB_VAR = -#endif /* ! defined (__GNUC__) */ +#endif /* not __GNUC__ */ #endif /* not ORDINARY_LINK */ /* Specify address for ld to start loading at, @@ -354,13 +395,13 @@ LD=$(CC) -nostdlib #else /* not ORDINARY_LINK */ #ifdef LINKER LD=LINKER -#else /* ! defined (LINKER) */ +#else /* not LINKER */ LD=ld -#endif /* ! defined (LINKER) */ -#endif /* ! defined (COFF_ENCAPSULATE) */ +#endif /* not LINKER */ +#endif /* not COFF_ENCAPSULATE */ #endif /* not ORDINARY_LINK */ -LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_MACHINE LD_SWITCH_SITE +ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_MACHINE LD_SWITCH_SITE $(LDFLAGS) /* A macro which other sections of ymakefile can redefine to munge the flags before they're passed to LD. This is helpful if you have @@ -405,6 +446,11 @@ obj= dispnew.o frame.o scroll.o xdisp.o window.o \ process.o callproc.o \ doprnt.o GETLOADAVG_OBJ +/* Object files used on some machine or other. + These go in the DOC file on all machines + in case they are needed there. */ +SOME_MACHINE_OBJECTS = sunfns.o + #ifdef TERMINFO /* Used to be -ltermcap here. If your machine needs that, define LIBS_TERMCAP in the m/*.h file. */ @@ -443,10 +489,16 @@ allocaobj = alloca.o allocaobj = #endif +#ifdef USE_X_TOOLKIT +widgetobj= widget.o +#else /* not USE_X_TOOLKIT */ +widgetobj= +#endif /* not USE_X_TOOLKIT */ + /* define otherobj as list of object files that make-docfile should not be told about. */ -otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) +otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) #ifdef LISP_FLOAT_TYPE #define FLOAT_SUPPORT ${lispdir}float-sup.elc @@ -455,11 +507,18 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) #endif #ifdef MULTI_FRAME -#define FRAME_SUPPORT ${lispdir}frame.elc ${lispdir}mouse.elc ${lispdir}select.elc ${lispdir}scroll-bar.elc +#define FRAME_SUPPORT ${lispdir}frame.elc ${lispdir}menu-bar.elc \ + ${lispdir}mouse.elc ${lispdir}select.elc ${lispdir}scroll-bar.elc #else #define FRAME_SUPPORT #endif +#ifdef HAVE_X_WINDOWS +#define X_WINDOWS_SUPPORT +#else +#define X_WINDOWS_SUPPORT +#endif + #ifdef VMS #define VMS_SUPPORT ${lispdir}vmsproc.elc ${lispdir}vms-patch #else @@ -472,11 +531,7 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) Note that this list should not include lisp files which might not be present, like site-load.el and site-init.el; this makefile - expects them all to be either present or buildable. - - It should not include version.el. That file is often changed by - the build process itself, but most of the files which want to - depend on lisp.h don't care about those changes. */ + expects them all to be either present or buildable. */ lisp= \ ${lispdir}abbrev.elc \ ${lispdir}buff-menu.elc \ @@ -486,6 +541,7 @@ lisp= \ ${lispdir}fill.elc \ FLOAT_SUPPORT \ FRAME_SUPPORT \ + X_WINDOWS_SUPPORT \ ${lispdir}help.elc \ ${lispdir}indent.elc \ ${lispdir}isearch.elc \ @@ -504,7 +560,8 @@ lisp= \ ${lispdir}text-mode.elc \ ${lispdir}vc-hooks.elc \ VMS_SUPPORT \ - ${lispdir}window.elc + ${lispdir}window.elc \ + ${lispdir}version.el /* Construct full set of libraries to be linked. Note that SunOS needs -lm to come before -lc; otherwise, you get @@ -532,28 +589,23 @@ all: emacs OTHER_FILES emacs: temacs ${etc}DOC ${lisp} #ifdef CANNOT_DUMP + rm -f emacs ln temacs emacs #else #ifdef HAVE_SHM - -if [ -w ${srcdir}/../lisp ]; then \ - w=`pwd`; cd ${srcdir}; $${w}/temacs -nl -batch -l ../lisp/inc-vers; \ - else true; fi ./temacs -nl -batch -l loadup dump #else /* ! defined (HAVE_SHM) */ - -if [ -w ${srcdir}/../lisp ]; then \ - w=`pwd`; cd ${srcdir}; $${w}/temacs -batch -l ../lisp/inc-vers; \ - else true; fi ./temacs -batch -l loadup dump #endif /* ! defined (HAVE_SHM) */ #endif /* ! defined (CANNOT_DUMP) */ -${etc}DOC: ${libsrc}make-docfile ${obj} ${lisp} OBJECTS_SYSTEM OBJECTS_MACHINE +${etc}DOC: ${libsrc}make-docfile ${obj} ${lisp} rm -f ${etc}DOC - ${libsrc}make-docfile -d ${srcdir} ${obj} OBJECTS_SYSTEM OBJECTS_MACHINE ${lisp} \ - ${lispdir}version.el > ${etc}DOC + ${libsrc}make-docfile -d ${srcdir} ${obj} ${SOME_MACHINE_OBJECTS} \ + ${lisp} > ${etc}DOC ${libsrc}make-docfile: - cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile ../arch-lib + cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile /* Some systems define this to cause parallel Make-ing. */ #ifndef MAKE_PARALLEL @@ -561,7 +613,7 @@ ${libsrc}make-docfile: #endif temacs: MAKE_PARALLEL $(LOCALCPP) $(SHORT) $(STARTFILES) $(OLDXMENU) ${obj} ${otherobj} OBJECTS_SYSTEM OBJECTS_MACHINE prefix-args - $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${LDFLAGS}) \ + $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${ALL_LDFLAGS}) \ -o temacs ${STARTFILES} ${obj} ${otherobj} \ OBJECTS_SYSTEM OBJECTS_MACHINE ${LIBES} @@ -597,9 +649,38 @@ shortnames: #define OLDXMENU_OPTIONS #endif +/* Don't lose if this was not defined. */ +#ifndef LWLIB_OPTIONS +#define LWLIB_OPTIONS +#endif + #ifdef HAVE_X_WINDOWS -#ifdef HAVE_X_MENU #ifdef HAVE_X11 +#ifdef USE_X_TOOLKIT +$(OLDXMENU): really-lwlib + -rm -f $(OLDXMENU) /* We might have a link to an old version. */ + ${LN_S} ${lwlibdir}liblw.a $(OLDXMENU) + +/* Encode the values of these two macros in Make variables, + so we can use $(...) to substitute their values within "...". */ +C_SWITCH_MACHINE_1 = C_SWITCH_MACHINE +C_SWITCH_SYSTEM_1 = C_SWITCH_SYSTEM +C_SWITCH_SITE_1 = C_SWITCH_SITE +C_SWITCH_X_SITE_1 = C_SWITCH_X_SITE +C_SWITCH_X_MACHINE_1 = C_SWITCH_X_MACHINE +C_SWITCH_X_SYSTEM_1 = C_SWITCH_X_SYSTEM +really-lwlib: + cd ${lwlibdir}; ${MAKE} ${MFLAGS} LWLIB_OPTIONS \ + CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \ + "C_SWITCH_X_SITE=$(C_SWITCH_X_SITE_1)" \ + "C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \ + "C_SWITCH_X_SYSTEM=$(C_SWITCH_X_SYSTEM_1)" \ + "C_SWITCH_SITE=$(C_SWITCH_SITE_1)" \ + "C_SWITCH_MACHINE=$(C_SWITCH_MACHINE_1)" \ + "C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)" + @true /* make -t should not create really-lwlib. */ +#else /* not USE_X_TOOLKIT */ +#ifdef HAVE_X_MENU $(OLDXMENU): really-oldXMenu -rm -f $(OLDXMENU) /* We might have a link to an old version. */ ${LN_S} ${oldXMenudir}libXMenu11.a $(OLDXMENU) @@ -622,9 +703,10 @@ really-oldXMenu: "C_SWITCH_MACHINE=$(C_SWITCH_MACHINE_1)" \ "C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)" @true /* make -t should not create really-oldXMenu. */ -#endif /* ! defined (HAVE_X11) */ -#endif /* ! defined (HAVE_X_MENU) */ -#endif /* ! defined (HAVE_X_WINDOWS) */ +#endif /* HAVE_X_MENU */ +#endif /* not USE_X_TOOLKIT */ +#endif /* HAVE_X11 */ +#endif /* HAVE_X_WINDOWS */ paths.h: paths.h.in @echo "The file paths.h needs to be set up from paths.h.in." @@ -652,7 +734,7 @@ alloca.o : alloca.c $(ALL_CFLAGS) ${srcdir}/alloca.c #else #ifndef HAVE_ALLOCA -alloca.o : alloca.s config.h +alloca.o : alloca.s $(config_h) /* $(CPP) is cc -E, which may get confused by filenames that do not end in .c. So copy file to a safe name. */ cp ${srcdir}/alloca.s allocatem.c @@ -677,11 +759,12 @@ alloca.o : alloca.s config.h and so rarely changed in ways that do require any. */ abbrev.o : abbrev.c buffer.h commands.h $(config_h) -buffer.o : buffer.c syntax.h buffer.h commands.h window.h \ +buffer.o : buffer.c buffer.h commands.h window.h \ INTERVAL_SRC blockinput.h $(config_h) callint.o : callint.c window.h commands.h buffer.h mocklisp.h \ keyboard.h $(config_h) -callproc.o : callproc.c paths.h buffer.h commands.h $(config_h) process.h +callproc.o : callproc.c paths.h buffer.h commands.h $(config_h) \ + process.h systty.h syssignal.h casefiddle.o : casefiddle.c syntax.h commands.h buffer.h $(config_h) casetab.o : casetab.c buffer.h $(config_h) cm.o : cm.c cm.h termhooks.h $(config_h) @@ -696,7 +779,6 @@ doc.o : doc.c $(config_h) paths.h buffer.h keyboard.h doprnt.o : doprnt.c 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) - $(CC) -c -DCONFIGURATION="$(configuration)" $(CPPFLAGS) $(ALL_CFLAGS) $< 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) @@ -735,7 +817,11 @@ termcap.o : termcap.c $(config_h) terminfo.o : terminfo.c $(config_h) tparam.o : tparam.c $(config_h) undo.o : undo.c buffer.h commands.h $(config_h) -UNEXEC : UNEXEC_SRC $(config_h) +/* This hack is to discard any space that cpp might put at the beginning + 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) 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 \ @@ -746,7 +832,7 @@ xfns.o : xfns.c buffer.h frame.h window.h keyboard.h xterm.h \ blockinput.h $(config_h) xmenu.o : xmenu.c xterm.h window.h frame.h keyboard.h blockinput.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 \ + dispextern.h frame.h disptab.h blockinput.h systime.h syssignal.h \ gnu.h sink.h sinkmask.h $(config_h) xselect.o : xselect.c dispextern.h frame.h xterm.h blockinput.h $(config_h) xrdb.o : xrdb.c $(config_h) @@ -778,7 +864,7 @@ sunfns.o : sunfns.c buffer.h $(config_h) ${libsrc}emacstool: ${libsrc}emacstool.c cd ${libsrc}; ${MAKE} ${MFLAGS} emacstool mostlyclean: - rm -f temacs prefix-args xmakefile* core \#* *.o libXMenu11.a + rm -f temacs prefix-args xmakefile* core \#* *.o libXMenu11.a liblw.a rm -f ../etc/DOC clean: mostlyclean rm -f emacs-* emacs @@ -803,8 +889,14 @@ unlock: relock: chmod -w $(SOURCES) chmod +w paths.h -tagsfiles = [a-z]*.h [a-z]*.c ../lisp/[a-z]*.el ../lisp/term/[a-z]*.el -TAGS: $(tagsfiles) - etags $(tagsfiles) -tags: TAGS + +/* Arrange to make a tags table in ../lisp, and another in this dir + which includes ../lisp/TAGS by reference. */ +ctagsfiles = [a-zA-Z]*.h [a-zA-Z]*.c +lisptagsfiles = ../lisp/[a-zA-Z]*.el ../lisp/term/[a-zA-Z]*.el +TAGS: $(ctagsfiles) + ../lib-src/etags --include=../lisp/TAGS $(ctagsfiles) +../lisp/TAGS: $(lisptagsfiles) + cd ../lisp; $(MAKE) TAGS +tags: TAGS ../lisp/TAGS .PHONY: tags