Mercurial > emacs
comparison src/Makefile.in @ 90261:7beb78bc1f8e
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 616-696)
- Add lisp/mh-e/.arch-inventory
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords.
- lisp/gnus/ChangeLog: Remove duplicate entry
* gnus--rel--5.10 (patch 147-181)
- Update from CVS
- Merge from emacs--cvs-trunk--0
- Update from CVS: lisp/mml.el (mml-preview): Doc fix.
- Update from CVS: texi/message.texi: Fix default values.
- Update from CVS: texi/gnus.texi (RSS): Addition.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 16 Jan 2006 08:37:27 +0000 |
parents | fa0da9b57058 6962eb3cd807 |
children | c5406394f567 |
comparison
equal
deleted
inserted
replaced
90260:0ca0d9181b5e | 90261:7beb78bc1f8e |
---|---|
673 ${lispsource}dos-fns.elc ${lispsource}dos-w32.elc ${lispsource}dos-vars.elc \ | 673 ${lispsource}dos-fns.elc ${lispsource}dos-w32.elc ${lispsource}dos-vars.elc \ |
674 ${lispsource}international/ccl.elc ${lispsource}international/codepage.elc | 674 ${lispsource}international/ccl.elc ${lispsource}international/codepage.elc |
675 | 675 |
676 #else | 676 #else |
677 #define MSDOS_SUPPORT | 677 #define MSDOS_SUPPORT |
678 #endif | |
679 | |
680 #ifdef HAVE_WINDOW_SYSTEM | |
681 #ifdef HAVE_X_WINDOWS | |
682 #define WINDOW_SUPPORT ${lispsource}image.elc \ | |
683 ${lispsource}international/fontset.elc ${lispsource}dnd.elc \ | |
684 ${lispsource}tool-bar.elc ${lispsource}mwheel.elc ${lispsource}x-dnd.elc | |
685 #else | |
686 #define WINDOW_SUPPORT ${lispsource}image.elc \ | |
687 ${lispsource}international/fontset.elc ${lispsource}dnd.elc \ | |
688 ${lispsource}tool-bar.elc ${lispsource}mwheel.elc | |
689 #endif | |
690 #else | |
691 #define WINDOW_SUPPORT | |
678 #endif | 692 #endif |
679 | 693 |
680 #ifdef WINDOWSNT | 694 #ifdef WINDOWSNT |
681 #define WINNT_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \ | 695 #define WINNT_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \ |
682 ${lispsource}dos-w32.elc ${lispsource}w32-vars.elc \ | 696 ${lispsource}dos-w32.elc ${lispsource}w32-vars.elc \ |
724 ${lispsource}emacs-lisp/float-sup.elc \ | 738 ${lispsource}emacs-lisp/float-sup.elc \ |
725 ${lispsource}frame.elc \ | 739 ${lispsource}frame.elc \ |
726 ${lispsource}help.elc \ | 740 ${lispsource}help.elc \ |
727 ${lispsource}indent.elc \ | 741 ${lispsource}indent.elc \ |
728 ${lispsource}isearch.elc \ | 742 ${lispsource}isearch.elc \ |
743 ${lispsource}rfn-eshadow.elc \ | |
729 ${lispsource}loadup.el \ | 744 ${lispsource}loadup.el \ |
730 ${lispsource}loaddefs.el \ | 745 ${lispsource}loaddefs.el \ |
731 ${lispsource}bindings.elc \ | 746 ${lispsource}bindings.elc \ |
732 ${lispsource}emacs-lisp/map-ynp.elc \ | 747 ${lispsource}emacs-lisp/map-ynp.elc \ |
733 ${lispsource}menu-bar.elc \ | 748 ${lispsource}menu-bar.elc \ |
767 ${lispsource}simple.elc \ | 782 ${lispsource}simple.elc \ |
768 ${lispsource}startup.elc \ | 783 ${lispsource}startup.elc \ |
769 ${lispsource}subr.elc \ | 784 ${lispsource}subr.elc \ |
770 ${lispsource}term/tty-colors.elc \ | 785 ${lispsource}term/tty-colors.elc \ |
771 ${lispsource}font-core.elc \ | 786 ${lispsource}font-core.elc \ |
787 ${lispsource}emacs-lisp/syntax.elc \ | |
788 ${lispsource}font-lock.elc \ | |
789 ${lispsource}jit-lock.elc \ | |
772 ${lispsource}textmodes/fill.elc \ | 790 ${lispsource}textmodes/fill.elc \ |
773 ${lispsource}textmodes/page.elc \ | 791 ${lispsource}textmodes/page.elc \ |
774 ${lispsource}textmodes/paragraphs.elc \ | 792 ${lispsource}textmodes/paragraphs.elc \ |
775 ${lispsource}textmodes/text-mode.elc \ | 793 ${lispsource}textmodes/text-mode.elc \ |
776 ${lispsource}emacs-lisp/timer.elc \ | 794 ${lispsource}emacs-lisp/timer.elc \ |
779 ${lispsource}ediff-hook.elc \ | 797 ${lispsource}ediff-hook.elc \ |
780 TOOLTIP_SUPPORT \ | 798 TOOLTIP_SUPPORT \ |
781 VMS_SUPPORT \ | 799 VMS_SUPPORT \ |
782 MSDOS_SUPPORT \ | 800 MSDOS_SUPPORT \ |
783 WINNT_SUPPORT \ | 801 WINNT_SUPPORT \ |
802 WINDOW_SUPPORT \ | |
784 ${lispsource}widget.elc \ | 803 ${lispsource}widget.elc \ |
785 ${lispsource}window.elc \ | 804 ${lispsource}window.elc \ |
786 ${lispsource}version.el | 805 ${lispsource}version.el |
787 | 806 |
788 /* These are relative file names for the Lisp files | 807 /* These are relative file names for the Lisp files |
808 ../lisp/format.elc \ | 827 ../lisp/format.elc \ |
809 ../lisp/frame.elc \ | 828 ../lisp/frame.elc \ |
810 ../lisp/help.elc \ | 829 ../lisp/help.elc \ |
811 ../lisp/indent.elc \ | 830 ../lisp/indent.elc \ |
812 ../lisp/isearch.elc \ | 831 ../lisp/isearch.elc \ |
832 ../lisp/rfn-eshadow.elc \ | |
813 ../lisp/loadup.el \ | 833 ../lisp/loadup.el \ |
814 ../lisp/loaddefs.el \ | 834 ../lisp/loaddefs.el \ |
815 ../lisp/bindings.elc \ | 835 ../lisp/bindings.elc \ |
816 ../lisp/emacs-lisp/map-ynp.elc \ | 836 ../lisp/emacs-lisp/map-ynp.elc \ |
817 ../lisp/env.elc \ | 837 ../lisp/env.elc \ |
851 ../lisp/simple.elc \ | 871 ../lisp/simple.elc \ |
852 ../lisp/startup.elc \ | 872 ../lisp/startup.elc \ |
853 ../lisp/subr.elc \ | 873 ../lisp/subr.elc \ |
854 ../lisp/term/tty-colors.elc \ | 874 ../lisp/term/tty-colors.elc \ |
855 ../lisp/font-core.elc \ | 875 ../lisp/font-core.elc \ |
876 ../lisp/emacs-lisp/syntax.elc \ | |
877 ../lisp/font-lock.elc \ | |
878 ../lisp/jit-lock.elc \ | |
856 ../lisp/textmodes/fill.elc \ | 879 ../lisp/textmodes/fill.elc \ |
857 ../lisp/textmodes/page.elc \ | 880 ../lisp/textmodes/page.elc \ |
858 ../lisp/textmodes/paragraphs.elc \ | 881 ../lisp/textmodes/paragraphs.elc \ |
859 ../lisp/textmodes/text-mode.elc \ | 882 ../lisp/textmodes/text-mode.elc \ |
860 ../lisp/emacs-lisp/timer.elc \ | 883 ../lisp/emacs-lisp/timer.elc \ |
874 ${dotdot}/lisp/select.elc ${dotdot}/lisp/scroll-bar.elc \ | 897 ${dotdot}/lisp/select.elc ${dotdot}/lisp/scroll-bar.elc \ |
875 ${dotdot}/lisp/vmsproc.elc ${dotdot}/lisp/vms-patch.elc \ | 898 ${dotdot}/lisp/vmsproc.elc ${dotdot}/lisp/vms-patch.elc \ |
876 ${dotdot}/lisp/ls-lisp.elc ${dotdot}/lisp/dos-fns.elc \ | 899 ${dotdot}/lisp/ls-lisp.elc ${dotdot}/lisp/dos-fns.elc \ |
877 ${dotdot}/lisp/w32-fns.elc ${dotdot}/lisp/dos-w32.elc \ | 900 ${dotdot}/lisp/w32-fns.elc ${dotdot}/lisp/dos-w32.elc \ |
878 ${dotdot}/lisp/disp-table.elc ${dotdot}/lisp/dos-vars.elc \ | 901 ${dotdot}/lisp/disp-table.elc ${dotdot}/lisp/dos-vars.elc \ |
879 ${dotdot}/lisp/tooltip.elc \ | 902 ${dotdot}/lisp/tooltip.elc ${dotdot}/lisp/image.elc \ |
903 ${dotdot}/lisp/dnd.elc ${dotdot}/lisp/mwheel.elc \ | |
904 ${dotdot}/lisp/tool-bar.elc \ | |
905 ${dotdot}/lisp/x-dnd.elc \ | |
880 ${dotdot}/lisp/international/ccl.elc \ | 906 ${dotdot}/lisp/international/ccl.elc \ |
881 ${dotdot}/lisp/international/codepage.elc | 907 ${dotdot}/lisp/international/codepage.elc \ |
908 ${dotdot}/lisp/international/fontset.elc | |
882 | 909 |
883 /* Construct full set of libraries to be linked. | 910 /* Construct full set of libraries to be linked. |
884 Note that SunOS needs -lm to come before -lc; otherwise, you get | 911 Note that SunOS needs -lm to come before -lc; otherwise, you get |
885 duplicated symbols. If the standard libraries were compiled | 912 duplicated symbols. If the standard libraries were compiled |
886 with GCC, we might need gnulib again after them. */ | 913 with GCC, we might need gnulib again after them. */ |
1157 disptab.h dispextern.h keyboard.h character.h charset.h coding.h ccl.h \ | 1184 disptab.h dispextern.h keyboard.h character.h charset.h coding.h ccl.h \ |
1158 msdos.h window.h keymap.h | 1185 msdos.h window.h keymap.h |
1159 termcap.o: termcap.c $(config_h) | 1186 termcap.o: termcap.c $(config_h) |
1160 terminfo.o: terminfo.c $(config_h) | 1187 terminfo.o: terminfo.c $(config_h) |
1161 tparam.o: tparam.c $(config_h) | 1188 tparam.o: tparam.c $(config_h) |
1162 undo.o: undo.c buffer.h commands.h $(config_h) | 1189 undo.o: undo.c buffer.h commands.h window.h $(config_h) |
1163 /* This hack is to discard any space that cpp might put at the beginning | 1190 /* This hack is to discard any space that cpp might put at the beginning |
1164 of UNEXEC when substituting it in. */ | 1191 of UNEXEC when substituting it in. */ |
1165 UNEXEC_ALIAS=UNEXEC | 1192 UNEXEC_ALIAS=UNEXEC |
1166 $(UNEXEC_ALIAS): UNEXEC_SRC $(config_h) | 1193 $(UNEXEC_ALIAS): UNEXEC_SRC $(config_h) |
1167 w16select.o: w16select.c dispextern.h frame.h blockinput.h atimer.h systime.h \ | 1194 w16select.o: w16select.c dispextern.h frame.h blockinput.h atimer.h systime.h \ |
1249 keyboard.h blockinput.h atimer.h systime.h buffer.h macterm.h $(config_h) | 1276 keyboard.h blockinput.h atimer.h systime.h buffer.h macterm.h $(config_h) |
1250 macterm.o: blockinput.h atimer.h systime.h syssignal.h macterm.h macgui.h \ | 1277 macterm.o: blockinput.h atimer.h systime.h syssignal.h macterm.h macgui.h \ |
1251 frame.h charset.h ccl.h dispextern.h fontset.h termhooks.h termopts.h \ | 1278 frame.h charset.h ccl.h dispextern.h fontset.h termhooks.h termopts.h \ |
1252 termchar.h gnu.h disptab.h buffer.h window.h keyboard.h $(INTERVAL_SRC) \ | 1279 termchar.h gnu.h disptab.h buffer.h window.h keyboard.h $(INTERVAL_SRC) \ |
1253 process.h coding.h $(config_h) | 1280 process.h coding.h $(config_h) |
1254 macselect.o: blockinput.h macterm.h macgui.h frame.h $(config_h) | 1281 macselect.o: blockinput.h macterm.h macgui.h frame.h keymap.h $(config_h) |
1255 | 1282 |
1256 ${emacsapp}Contents/Resources/English.lproj: | 1283 ${emacsapp}Contents/Resources/English.lproj: |
1257 mkdir -p $@ | 1284 mkdir -p $@ |
1258 | 1285 |
1259 ifneq (${emacsapp},${emacsappsrc}) | 1286 ifneq (${emacsapp},${emacsappsrc}) |