X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/4524691fd6b19eba558b92f5bdab60fd103f6e3b..0c4dd03b93994aabf05e8580b376c69b39324550:/src/Makefile.in?ds=sidebyside diff --git a/src/Makefile.in b/src/Makefile.in index 1029b03ef6..bc71b772cc 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,5 +1,5 @@ # Makefile for GNU Emacs. -# Copyright (C) 1985, 87, 88, 93, 94, 95, 99, 2000, 2001 +# Copyright (C) 1985, 87, 88, 93, 94, 95, 99, 2000, 2001, 2003 # Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -37,6 +37,7 @@ CFLAGS=@CFLAGS@ CPPFLAGS=@CPPFLAGS@ LDFLAGS=@LDFLAGS@ LN_S=@LN_S@ +EXEEXT=@EXEEXT@ # Substitute an assignment for the MAKE variable, because # BSD doesn't have it as a default. @SET_MAKE@ @@ -107,7 +108,7 @@ 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. */ + GNU/Linux is an exception because it uses a funny variant of GNU libc. */ #ifdef __GNU_LIBRARY__ #ifndef GNU_LINUX #define ORDINARY_LINK @@ -159,6 +160,12 @@ CC = C_COMPILER #define LD_SWITCH_SYSTEM_TEMACS #endif +/* Some s/SYSTEM.h files define this to request special switches + for compiling temacs. */ +#ifndef C_SWITCH_SYSTEM_TEMACS +#define C_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 @@ -246,12 +253,19 @@ STARTFILES = START_FILES #define C_SWITCH_ASM #endif +#if HAVE_GTK +#define USE_GTK +TOOLKIT_DEFINES = -DUSE_GTK +#endif + #ifdef USE_X_TOOLKIT #define USE_@X_TOOLKIT_TYPE@ TOOLKIT_DEFINES = -DUSE_@X_TOOLKIT_TYPE@ #else +#ifndef USE_GTK TOOLKIT_DEFINES = #endif +#endif /* DO NOT use -R. There is a special hack described in lastfile.c which is used instead. Some initialized data areas are modified @@ -266,7 +280,7 @@ TOOLKIT_DEFINES = /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM since it may have -I options that should override those two. */ -ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAG) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM ${CFLAGS} +ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS} .c.o: $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< @@ -294,7 +308,12 @@ ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAG) -I. -I${srcdi #ifdef HAVE_MENUS /* Include xmenu.o in the list of X object files. */ + +#ifdef USE_GTK +XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o gtkutil.o +#else XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o +#endif /* The X Menu stuff is present in the X10 distribution, but missing from X11. If we have X10, just use the installed library; @@ -366,10 +385,17 @@ LIBXT= $(LIBW) LIBXMU -lXt $(LIBXTR6) -lXext #endif /* not LIBXT_STATIC */ #else /* not USE_X_TOOLKIT */ + +#ifdef USE_GTK +LIBW=@GTK_LIBS@ +OLDXMENU= +LIBXMENU= +#endif /* USE_GTK */ + #ifdef HAVE_X_SM -LIBXT=-lSM -lICE +LIBXT=$(LIBW) -lSM -lICE #else -LIBXT= +LIBXT=$(LIBW) #endif #endif /* not USE_X_TOOLKIT */ @@ -499,8 +525,10 @@ LD=ld #endif /* not COFF_ENCAPSULATE */ #endif /* not ORDINARY_LINK */ -ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE \ - LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE $(LDFLAGS) +/* Flags to pass to LD only for temacs. */ +/* Don't split this line with a backslash. That can cause trouble with + some cpps. */ +TEMACS_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE /* 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 @@ -531,11 +559,20 @@ MSDOS_OBJ = dosfns.o msdos.o w16select.o #endif #endif +#ifdef HAVE_CARBON +mac = $(dot)$(dot)/mac/ +XMENU_OBJ = +MAC_OBJ = mac.o macterm.o macfns.o macmenu.o fontset.o +emacsapp = $(PWD)/$(mac)Emacs.app/ +emacsappsrc = ${srcdir}/../mac/Emacs.app/ +#else +XMENU_OBJ = xmenu.o +#endif /* 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 xmenu.o window.o \ - charset.o coding.o category.o ccl.o\ +obj= dispnew.o frame.o scroll.o xdisp.o fringe.o $(XMENU_OBJ) window.o \ + charset.o coding.o category.o ccl.o \ cm.o term.o xfaces.o $(XOBJ) \ emacs.o keyboard.o macros.o keymap.o sysdep.o \ buffer.o filelock.o insdel.o marker.o \ @@ -547,13 +584,14 @@ obj= dispnew.o frame.o scroll.o xdisp.o xmenu.o window.o \ process.o callproc.o \ region-cache.o sound.o atimer.o \ doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \ - $(MSDOS_OBJ) + $(MSDOS_OBJ) $(MAC_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 dosfns.o msdos.o \ - xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o + xterm.o xfns.o xmenu.o xselect.o xrdb.o \ + mac.o macterm.o macfns.o macmenu.o fontset.o #ifdef TERMINFO @@ -651,7 +689,8 @@ lisp= \ ${lispsource}abbrev.elc \ ${lispsource}buff-menu.elc \ ${lispsource}button.elc \ - ${lispsource}byte-run.elc \ + ${lispsource}emacs-lisp/byte-run.elc \ + ${lispsource}cus-face.elc \ ${lispsource}cus-start.elc \ ${lispsource}custom.elc \ ${lispsource}emacs-lisp/backquote.elc \ @@ -663,21 +702,23 @@ lisp= \ ${lispsource}format.elc \ ${lispsource}facemenu.elc \ MOUSE_SUPPORT \ - ${lispsource}float-sup.elc \ - ${lispsource}frame.elc\ + ${lispsource}emacs-lisp/float-sup.elc \ + ${lispsource}frame.elc \ ${lispsource}help.elc \ ${lispsource}indent.elc \ ${lispsource}isearch.elc \ ${lispsource}loadup.el \ ${lispsource}loaddefs.el \ ${lispsource}bindings.elc \ - ${lispsource}map-ynp.elc \ + ${lispsource}emacs-lisp/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}international/ucs-tables.elc \ ${lispsource}international/utf-8.elc \ + ${lispsource}international/utf-16.elc \ ${lispsource}international/latin-1.el \ ${lispsource}international/latin-2.el \ ${lispsource}international/latin-3.el \ @@ -690,6 +731,9 @@ lisp= \ ${lispsource}language/cyrillic.elc \ ${lispsource}language/indian.elc \ ${lispsource}language/devanagari.el \ + ${lispsource}language/kannada.el \ + ${lispsource}language/malayalam.el \ + ${lispsource}language/tamil.el \ ${lispsource}language/english.el \ ${lispsource}language/ethiopic.elc \ ${lispsource}language/european.elc \ @@ -714,10 +758,12 @@ lisp= \ ${lispsource}startup.elc \ ${lispsource}subr.elc \ ${lispsource}term/tty-colors.elc \ + ${lispsource}font-core.elc \ ${lispsource}textmodes/fill.elc \ ${lispsource}textmodes/page.elc \ ${lispsource}textmodes/paragraphs.elc \ ${lispsource}textmodes/text-mode.elc \ + ${lispsource}emacs-lisp/timer.elc \ ${lispsource}vc-hooks.elc \ ${lispsource}ediff-hook.elc \ VMS_SUPPORT \ @@ -735,7 +781,8 @@ shortlisp= \ ../lisp/abbrev.elc \ ../lisp/buff-menu.elc \ ../lisp/button.elc \ - ../lisp/byte-run.elc \ + ../lisp/emacs-lisp/byte-run.elc \ + ../lisp/cus-face.elc \ ../lisp/cus-start.elc \ ../lisp/custom.elc \ ../lisp/emacs-lisp/backquote.elc \ @@ -744,7 +791,7 @@ shortlisp= \ ../lisp/facemenu.elc \ ../lisp/faces.elc \ ../lisp/files.elc \ - ../lisp/float-sup.elc \ + ../lisp/emacs-lisp/float-sup.elc \ ../lisp/format.elc \ ../lisp/frame.elc \ ../lisp/help.elc \ @@ -753,13 +800,15 @@ shortlisp= \ ../lisp/loadup.el \ ../lisp/loaddefs.el \ ../lisp/bindings.elc \ - ../lisp/map-ynp.elc \ + ../lisp/emacs-lisp/map-ynp.elc \ ../lisp/env.elc \ ../lisp/international/mule.elc \ ../lisp/international/mule-conf.el \ ../lisp/international/mule-cmds.elc \ ../lisp/international/characters.elc \ + ../lisp/international/ucs-tables.elc \ ../lisp/international/utf-8.elc \ + ../lisp/international/utf-16.elc \ ../lisp/international/latin-1.el \ ../lisp/international/latin-2.el \ ../lisp/international/latin-3.el \ @@ -772,6 +821,9 @@ shortlisp= \ ../lisp/language/cyrillic.elc \ ../lisp/language/indian.elc \ ../lisp/language/devanagari.el \ + ../lisp/language/kannada.el \ + ../lisp/language/malayalam.el \ + ../lisp/language/tamil.el \ ../lisp/language/english.el \ ../lisp/language/ethiopic.elc \ ../lisp/language/european.elc \ @@ -797,10 +849,12 @@ shortlisp= \ ../lisp/startup.elc \ ../lisp/subr.elc \ ../lisp/term/tty-colors.elc \ + ../lisp/font-core.elc \ ../lisp/textmodes/fill.elc \ ../lisp/textmodes/page.elc \ ../lisp/textmodes/paragraphs.elc \ ../lisp/textmodes/text-mode.elc \ + ../lisp/emacs-lisp/timer.elc \ ../lisp/vc-hooks.elc \ ../lisp/ediff-hook.elc \ ../lisp/widget.elc \ @@ -811,7 +865,7 @@ shortlisp= \ We must unconditionally put them in the DOC file. We use ../lisp/ to start the file names to reduce the size of the argument list for make-docfile - for the sake of systems which can't handle large ones. */ + for the sake of systems which can\'t handle large ones. */ SOME_MACHINE_LISP = ${dotdot}/lisp/mouse.elc \ ${dotdot}/lisp/select.elc ${dotdot}/lisp/scroll-bar.elc \ ${dotdot}/lisp/vmsproc.elc ${dotdot}/lisp/vms-patch.elc \ @@ -840,12 +894,12 @@ LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) \ #define OBJECTS_MACHINE #endif -all: emacs OTHER_FILES +all: emacs${EXEEXT} OTHER_FILES -emacs: temacs ${etc}DOC ${lisp} +emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp} #ifdef CANNOT_DUMP - rm -f emacs - ln temacs emacs + rm -f emacs${EXEEXT} + ln temacs${EXEEXT} emacs${EXEEXT} #else #ifdef HAVE_SHM LC_ALL=C ./temacs -nl -batch -l loadup dump @@ -868,23 +922,23 @@ ${etc}DOC: ${libsrc}make-docfile ${obj} ${shortlisp} ${SOME_MACHINE_LISP} ${libsrc}make-docfile -d ${srcdir} ${SOME_MACHINE_OBJECTS} ${obj} > ${etc}DOC ${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} ${shortlisp} -${libsrc}make-docfile: - cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile +${libsrc}make-docfile${EXEEXT}: + cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile${EXEEXT} /* Some systems define this to cause parallel Make-ing. */ #ifndef MAKE_PARALLEL #define MAKE_PARALLEL #endif -temacs: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args - $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${ALL_LDFLAGS}) \ +temacs${EXEEXT}: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args${EXEEXT} + $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \ -o temacs ${STARTFILES} ${obj} ${otherobj} \ OBJECTS_MACHINE ${LIBES} /* We don't use ALL_LDFLAGS because LD_SWITCH_SYSTEM and LD_SWITCH_MACHINE often contain options that have to do with using Emacs's crt0, which are only good with temacs. */ -prefix-args: prefix-args.c $(config_h) +prefix-args${EXEEXT}: prefix-args.c $(config_h) $(CC) $(ALL_CFLAGS) $(LDFLAGS) ${srcdir}/prefix-args.c -o prefix-args /* Don't lose if this was not defined. */ @@ -892,18 +946,13 @@ prefix-args: prefix-args.c $(config_h) #define OLDXMENU_OPTIONS #endif -/* Don't lose if this was not defined. */ -#ifndef LWLIB_OPTIONS -#define LWLIB_OPTIONS -#endif - #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) /* 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) +stamp-oldxmenu: ${OLDXMENU} ../src/$(OLDXMENU) touch stamp-oldxmenu /* Supply an ordering for parallel make. */ ../src/$(OLDXMENU): ${OLDXMENU} @@ -920,7 +969,7 @@ 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 \ + cd ${lwlibdir}; ${MAKE} ${MFLAGS} \ CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \ "C_SWITCH_X_SITE=$(C_SWITCH_X_SITE_1)" \ "C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \ @@ -955,7 +1004,7 @@ really-oldXMenu: #endif /* not USE_X_TOOLKIT */ #else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS) */ -/* We don't really need this, but satisfy the dependency. */ +/* We don\'t really need this, but satisfy the dependency. */ stamp-oldxmenu: touch stamp-oldxmenu #endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS) */ @@ -971,40 +1020,10 @@ stamp-oldxmenu: exit 1 /* Some machines have alloca built-in. - They should define HAVE_ALLOCA, or may just let alloca.s - be used but generate no code. - Some have it written in assembler in alloca.s. + They should define HAVE_ALLOCA. Some use the C version in alloca.c (these define C_ALLOCA in config.h). */ - -#ifdef C_ALLOCA -/* We could put something in alloca.c to #define free and malloc - whenever emacs was #defined, but that's not appropriate for all - users of alloca in Emacs. Check out ../lib-src/getopt.c. */ -alloca.o : alloca.c - $(CC) -c $(CPPFLAGS) -DEMACS_FREE=xfree \ - $(ALL_CFLAGS) ${srcdir}/alloca.c -#else -#ifndef HAVE_ALLOCA -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. */ - -rm -f allocatem.c - cp ${srcdir}/alloca.s allocatem.c -/* Remove any ^L, blank lines, and preprocessor comments, - since some assemblers barf on them. Use a different basename for the - output file, since some stupid compilers (Green Hill's) use that - name for the intermediate assembler file. */ - $(CPP) $(CPPFLAGS) $(ALL_CFLAGS) allocatem.c | \ - sed -e 's/ //' -e 's/^#.*//' | \ - sed -n -e '/^..*$$/p' > allocax.s - -rm -f alloca.o -/* Xenix, in particular, needs to run assembler via cc. */ - $(CC) -c allocax.s - mv allocax.o alloca.o - -rm -f allocax.s allocatem.c -#endif /* HAVE_ALLOCA */ -#endif /* ! defined (C_ALLOCA) */ +alloca.o: alloca.c blockinput.h atimer.h /* Nearly all the following files depend on lisp.h, but it is not included as a dependency because @@ -1027,7 +1046,7 @@ category.o: category.c category.h buffer.h charset.h $(config_h) ccl.o: ccl.c ccl.h charset.h coding.h $(config_h) charset.o: charset.c charset.h buffer.h coding.h composite.h disptab.h \ $(config_h) -coding.o: coding.c coding.h ccl.h buffer.h charset.h $(config_h) +coding.o: coding.c coding.h ccl.h buffer.h charset.h intervals.h composite.h window.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) \ msdos.h dispextern.h @@ -1047,20 +1066,23 @@ 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 \ coding.h dispextern.h $(config_h) emacs.o: emacs.c commands.h systty.h syssignal.h blockinput.h process.h \ - termhooks.h buffer.h atimer.h systime.h $(INTERVAL_SRC) $(config_h) + termhooks.h buffer.h atimer.h systime.h $(INTERVAL_SRC) $(config_h) \ + window.h keyboard.h keymap.h fileio.o: fileio.c window.h buffer.h systime.h $(INTERVAL_SRC) charset.h \ coding.h ccl.h msdos.h dispextern.h $(config_h) filelock.o: filelock.c buffer.h systime.h epaths.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 msdos.h dosfns.h dispextern.h $(config_h) + blockinput.h atimer.h systime.h buffer.h charset.h fontset.h \ + msdos.h dosfns.h dispextern.h $(config_h) +fringe.o: fringe.c dispextern.h frame.h window.h buffer.h $(config_h) fontset.o: dispextern.h fontset.h fontset.c ccl.h buffer.h charset.h frame.h \ keyboard.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 \ termopts.h disptab.h region-cache.h charset.h composite.h dispextern.h \ keyboard.h -insdel.o: insdel.c window.h buffer.h $(INTERVAL_SRC) blockinput.h charset.h\ +insdel.o: insdel.c window.h buffer.h $(INTERVAL_SRC) blockinput.h charset.h \ dispextern.h atimer.h systime.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 \ @@ -1076,12 +1098,13 @@ 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 charset.h $(config_h) +md5.o: md5.c md5.h $(config_h) minibuf.o: minibuf.c syntax.h dispextern.h frame.h window.h keyboard.h \ buffer.h commands.h charset.h msdos.h $(config_h) mktime.o: mktime.c $(config_h) msdos.o: msdos.c msdos.h dosfns.h systime.h termhooks.h dispextern.h frame.h \ termopts.h termchar.h charset.h coding.h ccl.h disptab.h window.h \ - keyboard.h $(config_h) + keyboard.h intervals.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 dispextern.h \ blockinput.h atimer.h charset.h coding.h ccl.h msdos.h composite.h \ @@ -1117,23 +1140,27 @@ window.o: window.c indent.h commands.h frame.h window.h buffer.h termchar.h \ $(config_h) xdisp.o: xdisp.c macros.h commands.h process.h indent.h buffer.h dispextern.h coding.h \ termchar.h frame.h window.h disptab.h termhooks.h charset.h $(config_h) \ - msdos.h composite.h fontset.h + msdos.h composite.h fontset.h blockinput.h atimer.h systime.h keymap.h xfaces.o: xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h \ window.h charset.h msdos.h dosfns.h composite.h atimer.h systime.h $(config_h) xfns.o: xfns.c buffer.h frame.h window.h keyboard.h xterm.h dispextern.h \ $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h systime.h epaths.h \ - charset.h $(config_h) + charset.h gtkutil.h $(config_h) xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h buffer.h \ keyboard.h $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h systime.h \ - msdos.h $(config_h) + gtkutil.h msdos.h coding.h $(config_h) xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h buffer.h \ dispextern.h frame.h disptab.h blockinput.h atimer.h systime.h syssignal.h \ keyboard.h gnu.h charset.h ccl.h fontset.h composite.h \ - coding.h process.h $(config_h) + coding.h process.h gtkutil.h $(config_h) xselect.o: xselect.c process.h dispextern.h frame.h xterm.h blockinput.h \ - charset.h coding.h ccl.h buffer.h atimer.h systime.h $(config_h) + buffer.h atimer.h systime.h $(config_h) xrdb.o: xrdb.c $(config_h) epaths.h -xsmfns.o: xsmfns.c $(config_h) systime.h sysselect.h lisp.h termhooks.h +xsmfns.o: xsmfns.c $(config_h) systime.h sysselect.h termhooks.h xterm.h \ + lisp.h termopts.h +gtkutil.o: gtkutil.c gtkutil.h xterm.h lisp.h frame.h $(config_h) \ + blockinput.h window.h atimer.h termhooks.h keyboard.h charset.h coding.h + hftctl.o: hftctl.c $(config_h) sound.o: sound.c dispextern.h $(config_h) atimer.o: atimer.c atimer.h systime.h $(config_h) @@ -1142,17 +1169,17 @@ atimer.o: atimer.c atimer.h systime.h $(config_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 charset.h dispextern.h $(config_h) $(INTERVAL_SRC) -bytecode.o: bytecode.c buffer.h syntax.h charset.h $(config_h) +bytecode.o: bytecode.c buffer.h syntax.h charset.h window.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 atimer.h systime.h \ - $(config_h) + dispextern.h $(config_h) floatfns.o: floatfns.c $(config_h) fns.o: fns.c commands.h $(config_h) frame.h buffer.h charset.h keyboard.h \ - frame.h window.h dispextern.h $(INTERVAL_SRC) -print.o: print.c process.h frame.h window.h buffer.h keyboard.h charset.h\ + frame.h window.h dispextern.h $(INTERVAL_SRC) coding.h md5.h +print.o: print.c process.h frame.h window.h buffer.h keyboard.h charset.h \ $(config_h) dispextern.h msdos.h composite.h lread.o: lread.c commands.h keyboard.h buffer.h epaths.h charset.h $(config_h) \ - termhooks.h msdos.h + termhooks.h coding.h msdos.h /* Text properties support */ textprop.o: textprop.c buffer.h window.h dispextern.h $(INTERVAL_SRC) \ @@ -1166,14 +1193,62 @@ composite.o: composite.c buffer.h charset.h $(INTERVAL_SRC) $(config_h) sunfns.o: sunfns.c buffer.h window.h dispextern.h $(config_h) -${libsrc}emacstool: ${libsrc}emacstool.c - cd ${libsrc}; ${MAKE} ${MFLAGS} emacstool +#ifdef HAVE_CARBON +abbrev.o buffer.o callint.o cmds.o dispnew.o editfns.o fileio.o frame.o \ + fontset.o indent.o insdel.o keyboard.o macros.o minibuf.o msdos.o process.o \ + scroll.o sysdep.o term.o widget.o window.o xdisp.o xfaces.o xfns.o xmenu.o \ + xterm.o xselect.o sound.o: macgui.h +mac.o: mac.c process.h sysselect.h systime.h $(config_h) +macfns.o: macfns.c charset.h macterm.h macgui.h frame.h window.h buffer.h \ + dispextern.h macgui.h fontset.h $(INTERVAL_SRC) keyboard.h blockinput.h \ + atimer.h systime.h epaths.h termhooks.h coding.h ccl.h systime.h $(config_h) +macmenu.o: macmenu.c termhooks.h frame.h window.h dispextern.h macgui.h \ + keyboard.h blockinput.h atimer.h systime.h buffer.h macterm.h $(config_h) +macterm.o: blockinput.h atimer.h systime.h syssignal.h macterm.h macgui.h \ + frame.h charset.h ccl.h dispextern.h fontset.h termhooks.h termopts.h \ + termchar.h gnu.h disptab.h buffer.h window.h keyboard.h $(INTERVAL_SRC) \ + process.h coding.h $(config_h) + +${emacsapp}Contents/Resources/English.lproj: + mkdir -p $@ + +ifneq (${emacsapp},${emacsappsrc}) +${emacsapp}Contents/Info.plist: ${emacsappsrc}Contents/Info.plist + cp $< $@ +${emacsapp}Contents/PkgInfo: ${emacsappsrc}Contents/PkgInfo + cp $< $@ +${emacsapp}Contents/Resources/Emacs.icns: ${emacsappsrc}Contents/Resources/Emacs.icns + mkdir -p ${emacsapp}Contents/Resources + cp $< $@ +${emacsapp}Contents/Resources/English.lproj/InfoPlist.strings: ${emacsappsrc}Contents/Resources/English.lproj/InfoPlist.strings + cp $< $@ +endif + +macosx-bundle: ${emacsapp}Contents/Resources/English.lproj \ + ${emacsapp}Contents/Info.plist ${emacsapp}Contents/PkgInfo \ + ${emacsapp}Contents/Resources/Emacs.icns \ + ${emacsapp}Contents/Resources/English.lproj/InfoPlist.strings +macosx-app: macosx-bundle ${emacsapp}Contents/MacOS/Emacs \ + ${emacsapp}Contents/Resources/Emacs.rsrc +${emacsapp}Contents/MacOS/Emacs: emacs${EXEEXT} + mkdir -p ${emacsapp}Contents/MacOS/; + cd ${emacsapp}Contents/MacOS/; cp ../../../../src/emacs${EXEEXT} Emacs${EXEEXT} +${emacsapp}Contents/Resources/Emacs.rsrc: ../mac/src/Emacs.r + /Developer/Tools/Rez -useDF \ + -o ${emacsapp}Contents/Resources/Emacs.rsrc \ + /System/Library/Frameworks/Carbon.framework/Headers/Carbon.r $< +#endif + +${libsrc}emacstool${EXEEXT}: ${libsrc}emacstool.c + cd ${libsrc}; ${MAKE} ${MFLAGS} emacstool${EXEEXT} +bootstrapclean: + rm -f bootstrap-emacs${EXEEXT} mostlyclean: - rm -f temacs prefix-args core *.core \#* *.o libXMenu11.a liblw.a + rm -f temacs${EXEEXT} prefix-args${EXEEXT} core *.core \#* *.o libXMenu11.a liblw.a rm -f ../etc/DOC - rm -f bootstrap-emacs + rm -f bootstrap-emacs${EXEEXT} clean: mostlyclean - rm -f emacs-* emacs + rm -f emacs-*${EXEEXT} emacs${EXEEXT} /**/# This is used in making a distribution. /**/# Do not use it on development directories! distclean: clean @@ -1186,7 +1261,7 @@ maintainer-clean: distclean @echo "it deletes files that may require special tools to rebuild." rm -f TAGS versionclean: - -rm -f emacs emacs-* ../etc/DOC* + -rm -f emacs${EXEEXT} emacs-* ../etc/DOC* extraclean: distclean -rm -f *~ \#* m/?*~ s/?*~ @@ -1204,7 +1279,7 @@ relock: /* Arrange to make a tags table TAGS-LISP for ../lisp, plus TAGS for the C files, which includes ../lisp/TAGS by reference. */ -ctagsfiles1 = [xyzXYZ]*.[hc] +ctagsfiles1 = [xyzXYZ]*.[hc] ctagsfiles2 = [a-wA-W]*.[hc] TAGS: $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2) @@ -1224,35 +1299,22 @@ tags: TAGS TAGS-LISP $(lwlibdir)TAGS /* Bootstrapping. */ -bootstrap: bootstrap-emacs - -/* Build a temacs with a sufficiently large PURESIZE to load the - Lisp files from loadup.el in source form. */ - -bootstrap-temacs: - LC_ALL=C $(MAKE) $(MFLAGS) temacs ALL_CFLAGS="$(ALL_CFLAGS) -DPURESIZE=5000000 -I../src" - -/* Build a DOC file. */ - -bootstrap-doc: ${libsrc}make-docfile - -rm -f ${etc}DOC - els=`echo ${shortlisp} ${SOME_MACHINE_LISP} \ - | sed -e "s/\\.elc/.el/g"`; \ - ${libsrc}make-docfile -d ${srcdir} $$els ${obj} > ${etc}DOC +bootstrap: bootstrap-emacs${EXEEXT} -/* Dump an Emacs executable named bootstrap-emacs containing the +/* Dump an Emacs executable named bootstrap-emacs containing the files from loadup.el in source form. */ -bootstrap-emacs: bootstrap-temacs bootstrap-doc +bootstrap-emacs${EXEEXT}: temacs${EXEEXT} #ifdef CANNOT_DUMP - ln temacs bootstrap-emacs + ln temacs${EXEEXT} bootstrap-emacs${EXEEXT} #else #ifdef HAVE_SHM ./temacs -nl -batch -l loadup bootstrap #else /* ! defined (HAVE_SHM) */ ./temacs --batch --load loadup bootstrap #endif /* ! defined (HAVE_SHM) */ + mv -f emacs${EXEEXT} bootstrap-emacs${EXEEXT} #endif /* ! defined (CANNOT_DUMP) */ - mv -f emacs bootstrap-emacs - rm -f temacs +/* arch-tag: 8e915ae5-d15d-4617-8c41-c5c267a23b00 + (do not change this comment) */