X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/29fad69a4d0f781685ce818208cd4f6cc31ff59f..17cea80917206c92bd0029bd620bd718926eae9c:/src/Makefile.in diff --git a/src/Makefile.in b/src/Makefile.in index 9fcc0e7fdd..583d57917e 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -24,6 +24,8 @@ VPATH=@srcdir@ CC=@CC@ CPP=@CPP@ CFLAGS=@CFLAGS@ +CPPFLAGS=@CPPFLAGS@ +LDFLAGS=@LDFLAGS@ LN_S=@LN_S@ # Substitute an assignment for the MAKE variable, because # BSD doesn't have it as a default. @@ -35,8 +37,6 @@ dotdot = ${dot}${dot} lispsource = ${srcdir}/$(dot)$(dot)/lisp/ libsrc = $(dot)$(dot)/lib-src/ etc = $(dot)$(dot)/etc/ -shortnamesdir = $(dot)$(dot)/shortnames/ -cppdir = $(dot)$(dot)/cpp/ oldXMenudir = $(dot)$(dot)/oldXMenu/ lwlibdir = $(dot)$(dot)/lwlib/ @@ -48,8 +48,6 @@ 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 */ @@ -144,11 +142,23 @@ CC = C_COMPILER #endif /* ! defined(COFF_ENCAPSULATE) || (defined (BSD_SYSTEM) && !defined (COFF)) */ #endif /* LD_SWITCH_SYSTEM */ +/* This holds special options for linking temacs + that should be used for linking anything else. */ +#ifndef LD_SWITCH_SYSTEM_TEMACS +#define LD_SWITCH_SYSTEM_TEMACS +#endif + /* Some m/MACHINE.h files define this to request special switches in ld. */ #ifndef LD_SWITCH_MACHINE #define LD_SWITCH_MACHINE #endif +/* This holds special options for linking temacs + that should be used for linking anything else. */ +#ifndef LD_SWITCH_MACHINE_TEMACS +#define LD_SWITCH_MACHINE_TEMACS +#endif + /* Some m/MACHINE.h files define this to request special switches in cc. */ #ifndef C_SWITCH_MACHINE #define C_SWITCH_MACHINE @@ -242,10 +252,6 @@ MYCPPFLAG= -Blocal LOCALCPP= localcpp #endif /* ! defined (LONGNAMEBBBARFOOX) */ -#ifdef SHORTNAMES -SHORT= shortnames -#endif - #ifdef USE_X_TOOLKIT #define USE_@X_TOOLKIT_TYPE@ TOOLKIT_DEFINES = -DUSE_@X_TOOLKIT_TYPE@ @@ -325,10 +331,15 @@ LIBXMENU= LIBW= -lXaw #endif #ifdef MOTIF +#ifdef HAVE_MOTIF_2_1 +#define LIB_MOTIF_EXTRA -lXp +#else +#define LIB_MOTIF_EXTRA +#endif #ifdef LIB_MOTIF -LIBW= LIB_MOTIF +LIBW= LIB_MOTIF LIB_MOTIF_EXTRA #else -LIBW= -lXm +LIBW= -lXm LIB_MOTIF_EXTRA #endif #endif #ifdef OPEN_LOOK @@ -444,7 +455,8 @@ LD=ld #endif /* not COFF_ENCAPSULATE */ #endif /* not ORDINARY_LINK */ -ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_MACHINE LD_SWITCH_SITE $(LDFLAGS) +ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE \ + LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE $(LDFLAGS) /* A macro which other sections of Makefile can redefine to munge the flags before they're passed to LD. This is helpful if you have @@ -633,9 +645,10 @@ lisp= \ ${lispsource}byte-run.elc \ ${lispsource}cus-start.el \ ${lispsource}custom.elc \ + ${lispsource}emacs-lisp/lisp-mode.elc \ + ${lispsource}emacs-lisp/lisp.elc \ ${lispsource}faces.elc \ ${lispsource}files.elc \ - ${lispsource}fill.elc \ ${lispsource}format.elc \ FACE_SUPPORT \ MOUSE_SUPPORT \ @@ -645,25 +658,28 @@ lisp= \ ${lispsource}help.elc \ ${lispsource}indent.elc \ ${lispsource}isearch.elc \ - ${lispsource}lisp-mode.elc \ - ${lispsource}lisp.elc \ ${lispsource}loadup.el \ ${lispsource}loaddefs.el \ + ${lispsource}bindings.el \ ${lispsource}map-ynp.elc \ ${lispsource}menu-bar.elc \ ${lispsource}international/mule.elc \ ${lispsource}international/mule-conf.el \ ${lispsource}international/mule-cmds.elc \ ${lispsource}international/characters.elc \ + ${lispsource}case-table.elc \ ${lispsource}language/chinese.elc \ ${lispsource}language/cyrillic.elc \ + ${lispsource}language/indian.elc \ ${lispsource}language/devanagari.elc \ ${lispsource}language/english.elc \ ${lispsource}language/ethiopic.elc \ ${lispsource}language/european.elc \ + ${lispsource}language/czech.elc \ + ${lispsource}language/slovak.elc \ + ${lispsource}language/romanian.elc \ ${lispsource}language/greek.elc \ ${lispsource}language/hebrew.elc \ - ${lispsource}language/indian.elc \ ${lispsource}language/japanese.elc \ ${lispsource}language/korean.elc \ ${lispsource}language/lao.elc \ @@ -671,20 +687,22 @@ lisp= \ ${lispsource}language/tibetan.elc \ ${lispsource}language/vietnamese.elc \ ${lispsource}language/misc-lang.elc \ - ${lispsource}page.elc \ - ${lispsource}paragraphs.elc \ ${lispsource}paths.el \ ${lispsource}register.elc \ ${lispsource}replace.elc \ ${lispsource}simple.elc \ ${lispsource}startup.elc \ ${lispsource}subr.elc \ - ${lispsource}text-mode.elc \ + ${lispsource}textmodes/fill.elc \ + ${lispsource}textmodes/page.elc \ + ${lispsource}textmodes/paragraphs.elc \ + ${lispsource}textmodes/text-mode.elc \ ${lispsource}vc-hooks.elc \ ${lispsource}ediff-hook.elc \ VMS_SUPPORT \ MSDOS_SUPPORT \ WINNT_SUPPORT \ + ${lispsource}widget.elc \ ${lispsource}window.elc \ ${lispsource}version.el @@ -698,31 +716,35 @@ shortlisp= \ ../lisp/byte-run.elc \ ../lisp/cus-start.el \ ../lisp/custom.elc \ + ../lisp/emacs-lisp/lisp-mode.elc \ + ../lisp/emacs-lisp/lisp.elc \ ../lisp/faces.elc \ ../lisp/files.elc \ - ../lisp/fill.elc \ ../lisp/format.elc \ ../lisp/help.elc \ ../lisp/indent.elc \ ../lisp/isearch.elc \ - ../lisp/lisp-mode.elc \ - ../lisp/lisp.elc \ ../lisp/loadup.el \ ../lisp/loaddefs.el \ + ../lisp/bindings.el \ ../lisp/map-ynp.elc \ ../lisp/international/mule.elc \ ../lisp/international/mule-conf.el \ ../lisp/international/mule-cmds.elc \ - ../lisp/ainternational/characters.elc \ + ../lisp/international/characters.elc \ + ../lisp/case-table.elc \ ../lisp/language/chinese.elc \ ../lisp/language/cyrillic.elc \ + ../lisp/language/indian.elc \ ../lisp/language/devanagari.elc \ ../lisp/language/english.elc \ ../lisp/language/ethiopic.elc \ ../lisp/language/european.elc \ + ../lisp/language/czech.elc \ + ../lisp/language/slovak.elc \ + ../lisp/language/romanian.elc \ ../lisp/language/greek.elc \ ../lisp/language/hebrew.elc \ - ../lisp/language/indian.elc \ ../lisp/language/japanese.elc \ ../lisp/language/korean.elc \ ../lisp/language/lao.elc \ @@ -730,17 +752,19 @@ shortlisp= \ ../lisp/language/tibetan.elc \ ../lisp/language/vietnamese.elc \ ../lisp/language/misc-lang.elc \ - ../lisp/page.elc \ - ../lisp/paragraphs.elc \ ../lisp/paths.el \ ../lisp/register.elc \ ../lisp/replace.elc \ ../lisp/simple.elc \ ../lisp/startup.elc \ ../lisp/subr.elc \ - ../lisp/text-mode.elc \ + ../lisp/textmodes/fill.elc \ + ../lisp/textmodes/page.elc \ + ../lisp/textmodes/paragraphs.elc \ + ../lisp/textmodes/text-mode.elc \ ../lisp/vc-hooks.elc \ ../lisp/ediff-hook.elc \ + ../lisp/widget.elc \ ../lisp/window.elc \ ../lisp/version.el @@ -792,6 +816,7 @@ emacs: temacs ${etc}DOC ${lisp} ./temacs -batch -l loadup dump #endif /* ! defined (HAVE_SHM) */ #endif /* ! defined (CANNOT_DUMP) */ + -./emacs -q -batch -f list-load-path-shadows /* We run make-docfile twice because the command line may get too long on some systems. */ @@ -814,7 +839,7 @@ ${libsrc}make-docfile: #define MAKE_PARALLEL #endif -temacs: MAKE_PARALLEL $(LOCALCPP) $(SHORT) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_SYSTEM OBJECTS_MACHINE prefix-args +temacs: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_SYSTEM OBJECTS_MACHINE prefix-args $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${ALL_LDFLAGS}) \ -o temacs ${STARTFILES} ${obj} ${otherobj} \ OBJECTS_SYSTEM OBJECTS_MACHINE ${LIBES} @@ -844,11 +869,6 @@ localcpp: CPP = $(CC) -E #endif /* ! defined (NEED_CPP) */ -#ifdef SHORTNAMES -shortnames: - cd ${shortnamesdir}; ${MAKE} ${MFLAGS} -#endif - /* Don't lose if this was not defined. */ #ifndef OLDXMENU_OPTIONS #define OLDXMENU_OPTIONS @@ -867,6 +887,8 @@ shortnames: and remake temacs if lwlib gets changed by this. */ stamp-oldxmenu: ${OLDXMENU} ../src/$(OLDXMENU) touch stamp-oldxmenu +/* Supply an ordering for parallel make. */ +../src/$(OLDXMENU): ${OLDXMENU} #ifdef USE_X_TOOLKIT $(OLDXMENU): really-lwlib @@ -977,7 +999,7 @@ buffer.o: buffer.c buffer.h region-cache.h commands.h window.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 systty.h syssignal.h charset.h coding.h + process.h systty.h syssignal.h charset.h coding.h msdos.h casefiddle.o: casefiddle.c syntax.h commands.h buffer.h $(config_h) casetab.o: casetab.c buffer.h $(config_h) category.o: category.c category.h buffer.h charset.h $(config_h) @@ -985,27 +1007,28 @@ ccl.o: ccl.c ccl.h charset.h coding.h $(config_h) charset.o: charset.c charset.h buffer.h coding.h disptab.h $(config_h) coding.o: coding.c coding.h buffer.h charset.h $(config_h) cm.o: cm.c cm.h termhooks.h $(config_h) -cmds.o: cmds.c syntax.h buffer.h charset.h commands.h window.h $(config_h) +cmds.o: cmds.c syntax.h buffer.h charset.h commands.h window.h $(config_h) \ + msdos.h pre-crt0.o: pre-crt0.c ecrt0.o: ecrt0.c $(config_h) CRT0_COMPILE ${srcdir}/ecrt0.c -dired.o: dired.c commands.h buffer.h $(config_h) regex.h +dired.o: dired.c commands.h buffer.h $(config_h) charset.h coding.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 blockinput.h charset.h $(config_h) + xterm.h blockinput.h charset.h msdos.h $(config_h) doc.o: doc.c $(config_h) paths.h buffer.h keyboard.h doprnt.o: doprnt.c charset.h $(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 charset.h \ $(config_h) emacs.o: emacs.c commands.h systty.h syssignal.h blockinput.h process.h \ - INTERVAL_SRC $(config_h) + buffer.h INTERVAL_SRC $(config_h) fileio.o: fileio.c window.h buffer.h systime.h INTERVAL_SRC charset.h \ - coding.h $(config_h) + coding.h msdos.h $(config_h) filelock.o: filelock.c buffer.h paths.h $(config_h) filemode.o: filemode.c $(config_h) frame.o: frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \ - buffer.h charset.h fontset.h $(config_h) + buffer.h charset.h fontset.h msdos.h $(config_h) fontset.o: fontset.h fontset.c ccl.h charset.h frame.h $(config_h) getloadavg.o: getloadavg.c $(config_h) indent.o: indent.c frame.h window.h indent.h buffer.h $(config_h) termchar.h \ @@ -1014,7 +1037,8 @@ insdel.o: insdel.c window.h buffer.h INTERVAL_SRC blockinput.h charset.h\ $(config_h) keyboard.o: keyboard.c termchar.h termhooks.h termopts.h buffer.h charset.h \ commands.h frame.h window.h macros.h disptab.h keyboard.h syssignal.h \ - systty.h systime.h dispextern.h intervals.h blockinput.h xterm.h $(config_h) + systty.h systime.h dispextern.h syntax.h intervals.h blockinput.h \ + xterm.h puresize.h msdos.h $(config_h) keymap.o: keymap.c buffer.h commands.h keyboard.h termhooks.h blockinput.h \ puresize.h charset.h $(config_h) lastfile.o: lastfile.c $(config_h) @@ -1023,29 +1047,29 @@ malloc.o: malloc.c $(config_h) gmalloc.o: gmalloc.c $(config_h) ralloc.o: ralloc.c $(config_h) vm-limit.o: vm-limit.c mem-limits.h $(config_h) -marker.o: marker.c buffer.h $(config_h) +marker.o: marker.c buffer.h charset.h $(config_h) minibuf.o: minibuf.c syntax.h dispextern.h frame.h window.h \ - buffer.h commands.h charset.h $(config_h) + buffer.h commands.h charset.h msdos.h $(config_h) mktime.o: mktime.c $(config_h) mocklisp.o: mocklisp.c buffer.h $(config_h) msdos.o: msdos.c msdos.h dosfns.h systime.h termhooks.h dispextern.h \ termopts.h frame.h window.h $(config_h) process.o: process.c process.h buffer.h window.h termhooks.h termopts.h \ commands.h syssignal.h systime.h systty.h syswait.h frame.h \ - blockinput.h charset.h coding.h $(config_h) + blockinput.h charset.h coding.h msdos.h $(config_h) regex.o: regex.c syntax.h buffer.h $(config_h) regex.h category.h charset.h region-cache.o: region-cache.c buffer.h region-cache.h -scroll.o: scroll.c termchar.h dispextern.h frame.h $(config_h) +scroll.o: scroll.c termchar.h dispextern.h frame.h msdos.h $(config_h) search.o: search.c regex.h commands.h buffer.h region-cache.h syntax.h \ blockinput.h category.h charset.h $(config_h) strftime.o: strftime.c $(config_h) - $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -Dstrftime=emacs_strftime $< syntax.o: syntax.c syntax.h buffer.h commands.h category.h charset.h \ $(config_h) sysdep.o: sysdep.c $(config_h) dispextern.h termhooks.h termchar.h termopts.h \ - frame.h syssignal.h systty.h systime.h syswait.h blockinput.h window.h + frame.h syssignal.h systty.h systime.h syswait.h blockinput.h window.h \ + msdos.h term.o: term.c termchar.h termhooks.h termopts.h $(config_h) cm.h frame.h \ - disptab.h keyboard.h charset.h coding.h + disptab.h keyboard.h charset.h coding.h msdos.h termcap.o: termcap.c $(config_h) terminfo.o: terminfo.c $(config_h) tparam.o: tparam.c $(config_h) @@ -1054,31 +1078,33 @@ undo.o: undo.c buffer.h commands.h $(config_h) of UNEXEC when substituting it in. */ UNEXEC_ALIAS=UNEXEC $(UNEXEC_ALIAS): UNEXEC_SRC $(config_h) -w16select.o: w16select.c lisp.h dispextern.h frame.h blockinput.h +w16select.o: w16select.c lisp.h dispextern.h frame.h blockinput.h \ + msdos.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) + termhooks.h disptab.h keyboard.h dispextern.h msdos.h $(config_h) xdisp.o: xdisp.c macros.h commands.h indent.h buffer.h dispextern.h coding.h \ - termchar.h frame.h window.h disptab.h termhooks.h charset.h $(config_h) + termchar.h frame.h window.h disptab.h termhooks.h charset.h $(config_h) \ + msdos.h xfaces.o: xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h \ - window.h charset.h $(config_h) + window.h charset.h msdos.h $(config_h) xfns.o: xfns.c buffer.h frame.h window.h keyboard.h xterm.h\ ../lwlib/lwlib.h blockinput.h paths.h charset.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) + ../lwlib/lwlib.h blockinput.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 charset.h ccl.h fontset.h $(config_h) xselect.o: xselect.c dispextern.h frame.h xterm.h blockinput.h charset.h \ - $(config_h) -xrdb.o: xrdb.c $(config_h) + coding.h buffer.h $(config_h) +xrdb.o: xrdb.c $(config_h) paths.h hftctl.o: hftctl.c $(config_h) /* The files of Lisp proper */ alloc.o: alloc.c frame.h window.h buffer.h puresize.h syssignal.h keyboard.h \ - blockinput.h $(config_h) INTERVAL_SRC + blockinput.h charset.h $(config_h) INTERVAL_SRC bytecode.o: bytecode.c buffer.h syntax.h $(config_h) data.o: data.c buffer.h puresize.h charset.h syssignal.h keyboard.h $(config_h) eval.o: eval.c commands.h keyboard.h blockinput.h $(config_h) @@ -1086,9 +1112,9 @@ floatfns.o: floatfns.c $(config_h) fns.o: fns.c commands.h $(config_h) frame.h buffer.h keyboard.h \ frame.h window.h INTERVAL_SRC print.o: print.c process.h frame.h window.h buffer.h keyboard.h charset.h\ - $(config_h) + $(config_h) dispextern.h msdos.h lread.o: lread.c commands.h keyboard.h buffer.h paths.h charset.h $(config_h) \ - termhooks.h + termhooks.h msdos.h /* Text properties support */ textprop.o: textprop.c buffer.h window.h intervals.h $(config_h) @@ -1131,15 +1157,16 @@ relock: chmod -w $(SOURCES) chmod +w paths.h -/* Arrange to make a tags table in ../lisp, and another in this dir - which includes ../lisp/TAGS by reference. */ +/* Arrange to make a tags table TAGS-LISP for ../lisp, + plus TAGS for the C files, which includes ../lisp/TAGS by reference. */ ctagsfiles = [a-zA-Z]*.[hc] -lisptagsfiles = ../lisp/[a-zA-Z]*.el TAGS: $(srcdir)/$(ctagsfiles) - export DIR; DIR=`pwd`; cd ${srcdir}; \ - $$DIR/../lib-src/etags --include=../lisp/TAGS \ - --regex='/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/' $(ctagsfiles) -${lispsource}TAGS: ${lispsource}$(lisptagsfiles) - cd ${lispsource}; $(MAKE) TAGS -tags: TAGS ${lispsource}TAGS + ../lib-src/etags --include=TAGS-LISP \ + --regex='/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/' \ + $(srcdir)/$(ctagsfiles) +frc: +TAGS-LISP: frc + $(MAKE) -f ${lispsource}Makefile TAGS-LISP ETAGS=../lib-src/etags \ + lispsource=${lispsource} +tags: TAGS TAGS-LISP .PHONY: tags