Mercurial > emacs
comparison src/Makefile.in @ 108170:95d0ee272263
Simplify some manual dependencies in src/Makefile.in.
* src/Makefile.in (dispnew.o, frame.o, fringe.o, font.o, fontset.o)
(keyboard.o, window.o, xdisp.o, xfaces.o, menu.o):
Don't bother making nsgui.h dependency platform-specific.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Thu, 29 Apr 2010 18:27:33 -0700 |
parents | 8a2a7a0c2a8f |
children | 06a18c2b3272 |
comparison
equal
deleted
inserted
replaced
108169:8a2a7a0c2a8f | 108170:95d0ee272263 |
---|---|
832 $(CC) -c $(ALL_CFLAGS) ${srcdir}/ecrt0.c | 832 $(CC) -c $(ALL_CFLAGS) ${srcdir}/ecrt0.c |
833 doc.o: buildobj.h | 833 doc.o: buildobj.h |
834 | 834 |
835 #ifndef AUTO_DEPEND | 835 #ifndef AUTO_DEPEND |
836 | 836 |
837 ## FIXME some of these dependencies are platform-specific. | |
838 ## Eg callproc.c only depends on w32.h for WINDOWSNT builds. | |
839 ## One way to fix this would be to replace w32.h (etc) by $(W32_H), | |
840 ## a variable set by configure. Doesn't seem worth the trouble. | |
841 | |
842 ## nsgui.h: In fact, every .o file depends directly or indirectly on | |
843 ## dispextern.h and hence nsgui.h under NS. But the ones that actually | |
844 ## use stuff there are more limited. | |
837 atimer.o: atimer.c atimer.h syssignal.h systime.h lisp.h blockinput.h \ | 845 atimer.o: atimer.c atimer.h syssignal.h systime.h lisp.h blockinput.h \ |
838 $(config_h) | 846 $(config_h) |
839 bidi.o: bidi.c buffer.h character.h dispextern.h lisp.h $(config_h) | 847 bidi.o: bidi.c buffer.h character.h dispextern.h lisp.h $(config_h) |
840 buffer.o: buffer.c buffer.h region-cache.h commands.h window.h \ | 848 buffer.o: buffer.c buffer.h region-cache.h commands.h window.h \ |
841 $(INTERVALS_H) blockinput.h atimer.h systime.h character.h \ | 849 $(INTERVALS_H) blockinput.h atimer.h systime.h character.h \ |
867 dbusbind.o: dbusbind.c termhooks.h frame.h keyboard.h lisp.h $(config_h) | 875 dbusbind.o: dbusbind.c termhooks.h frame.h keyboard.h lisp.h $(config_h) |
868 dired.o: dired.c commands.h buffer.h lisp.h $(config_h) character.h charset.h \ | 876 dired.o: dired.c commands.h buffer.h lisp.h $(config_h) character.h charset.h \ |
869 coding.h regex.h systime.h blockinput.h atimer.h composite.h | 877 coding.h regex.h systime.h blockinput.h atimer.h composite.h |
870 dispnew.o: dispnew.c systime.h commands.h process.h frame.h coding.h \ | 878 dispnew.o: dispnew.c systime.h commands.h process.h frame.h coding.h \ |
871 window.h buffer.h termchar.h termopts.h termhooks.h cm.h \ | 879 window.h buffer.h termchar.h termopts.h termhooks.h cm.h \ |
872 disptab.h indent.h $(INTERVALS_H) \ | 880 disptab.h indent.h $(INTERVALS_H) nsgui.h \ |
873 xterm.h blockinput.h atimer.h character.h msdos.h keyboard.h \ | 881 xterm.h blockinput.h atimer.h character.h msdos.h keyboard.h \ |
874 syssignal.h lisp.h $(config_h) | 882 syssignal.h lisp.h $(config_h) |
875 doc.o: doc.c lisp.h $(config_h) epaths.h buffer.h keyboard.h keymap.h \ | 883 doc.o: doc.c lisp.h $(config_h) epaths.h buffer.h keyboard.h keymap.h \ |
876 character.h systime.h coding.h composite.h | 884 character.h systime.h coding.h composite.h |
877 doprnt.o: doprnt.c character.h lisp.h $(config_h) | 885 doprnt.o: doprnt.c character.h lisp.h $(config_h) |
888 filelock.o: filelock.c buffer.h character.h coding.h systime.h composite.h \ | 896 filelock.o: filelock.c buffer.h character.h coding.h systime.h composite.h \ |
889 lisp.h $(config_h) | 897 lisp.h $(config_h) |
890 filemode.o: filemode.c $(config_h) | 898 filemode.o: filemode.c $(config_h) |
891 frame.o: frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \ | 899 frame.o: frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \ |
892 blockinput.h atimer.h systime.h buffer.h character.h fontset.h font.h \ | 900 blockinput.h atimer.h systime.h buffer.h character.h fontset.h font.h \ |
893 msdos.h dosfns.h dispextern.h w32term.h termchar.h coding.h composite.h \ | 901 msdos.h dosfns.h dispextern.h w32term.h nsgui.h termchar.h coding.h \ |
894 lisp.h $(config_h) termhooks.h ccl.h | 902 composite.h lisp.h $(config_h) termhooks.h ccl.h |
895 fringe.o: fringe.c dispextern.h frame.h window.h buffer.h termhooks.h \ | 903 fringe.o: fringe.c dispextern.h nsgui.h frame.h window.h buffer.h termhooks.h \ |
896 blockinput.h atimer.h systime.h lisp.h $(config_h) | 904 blockinput.h atimer.h systime.h lisp.h $(config_h) |
897 font.o: font.c dispextern.h frame.h window.h ccl.h character.h charset.h \ | 905 font.o: font.c dispextern.h frame.h window.h ccl.h character.h charset.h \ |
898 font.h lisp.h $(config_h) buffer.h composite.h fontset.h xterm.h | 906 font.h lisp.h $(config_h) buffer.h composite.h fontset.h xterm.h nsgui.h |
899 ftfont.o: dispextern.h frame.h character.h charset.h composite.h font.h \ | 907 ftfont.o: dispextern.h frame.h character.h charset.h composite.h font.h \ |
900 lisp.h $(config_h) blockinput.h atimer.h systime.h coding.h fontset.h \ | 908 lisp.h $(config_h) blockinput.h atimer.h systime.h coding.h fontset.h \ |
901 ccl.h ftfont.h | 909 ccl.h ftfont.h |
902 fontset.o: fontset.c fontset.h ccl.h buffer.h character.h \ | 910 fontset.o: fontset.c fontset.h ccl.h buffer.h character.h \ |
903 charset.h frame.h keyboard.h termhooks.h font.h lisp.h $(config_h) \ | 911 charset.h frame.h keyboard.h termhooks.h font.h lisp.h $(config_h) \ |
904 blockinput.h atimer.h systime.h coding.h $(INTERVALS_H) window.h xterm.h | 912 blockinput.h atimer.h systime.h coding.h $(INTERVALS_H) nsgui.h \ |
913 window.h xterm.h | |
905 getloadavg.o: getloadavg.c $(config_h) | 914 getloadavg.o: getloadavg.c $(config_h) |
906 gtkutil.o: gtkutil.c gtkutil.h xterm.h lisp.h frame.h lisp.h $(config_h) \ | 915 gtkutil.o: gtkutil.c gtkutil.h xterm.h lisp.h frame.h lisp.h $(config_h) \ |
907 blockinput.h window.h atimer.h systime.h termhooks.h keyboard.h \ | 916 blockinput.h window.h atimer.h systime.h termhooks.h keyboard.h \ |
908 charset.h coding.h syssignal.h dispextern.h composite.h | 917 charset.h coding.h syssignal.h dispextern.h composite.h |
909 image.o: image.c frame.h window.h dispextern.h blockinput.h atimer.h \ | 918 image.o: image.c frame.h window.h dispextern.h blockinput.h atimer.h \ |
915 insdel.o: insdel.c window.h buffer.h $(INTERVALS_H) blockinput.h character.h \ | 924 insdel.o: insdel.c window.h buffer.h $(INTERVALS_H) blockinput.h character.h \ |
916 dispextern.h atimer.h systime.h region-cache.h lisp.h $(config_h) | 925 dispextern.h atimer.h systime.h region-cache.h lisp.h $(config_h) |
917 keyboard.o: keyboard.c termchar.h termhooks.h termopts.h buffer.h character.h \ | 926 keyboard.o: keyboard.c termchar.h termhooks.h termopts.h buffer.h character.h \ |
918 commands.h frame.h window.h macros.h disptab.h keyboard.h syssignal.h \ | 927 commands.h frame.h window.h macros.h disptab.h keyboard.h syssignal.h \ |
919 systime.h syntax.h $(INTERVALS_H) blockinput.h atimer.h composite.h \ | 928 systime.h syntax.h $(INTERVALS_H) blockinput.h atimer.h composite.h \ |
920 xterm.h puresize.h msdos.h keymap.h w32term.h nsterm.h coding.h \ | 929 xterm.h puresize.h msdos.h keymap.h w32term.h nsterm.h nsgui.h coding.h \ |
921 lisp.h $(config_h) | 930 lisp.h $(config_h) |
922 keymap.o: keymap.c buffer.h commands.h keyboard.h termhooks.h blockinput.h \ | 931 keymap.o: keymap.c buffer.h commands.h keyboard.h termhooks.h blockinput.h \ |
923 atimer.h systime.h puresize.h character.h charset.h $(INTERVALS_H) keymap.h window.h \ | 932 atimer.h systime.h puresize.h character.h charset.h $(INTERVALS_H) keymap.h window.h \ |
924 coding.h frame.h lisp.h $(config_h) | 933 coding.h frame.h lisp.h $(config_h) |
925 lastfile.o: lastfile.c $(config_h) | 934 lastfile.o: lastfile.c $(config_h) |
994 widget.o: widget.c xterm.h frame.h dispextern.h widgetprv.h \ | 1003 widget.o: widget.c xterm.h frame.h dispextern.h widgetprv.h \ |
995 $(srcdir)/../lwlib/lwlib.h lisp.h $(config_h) | 1004 $(srcdir)/../lwlib/lwlib.h lisp.h $(config_h) |
996 window.o: window.c indent.h commands.h frame.h window.h buffer.h termchar.h \ | 1005 window.o: window.c indent.h commands.h frame.h window.h buffer.h termchar.h \ |
997 disptab.h keyboard.h msdos.h coding.h termhooks.h \ | 1006 disptab.h keyboard.h msdos.h coding.h termhooks.h \ |
998 keymap.h blockinput.h atimer.h systime.h $(INTERVALS_H) \ | 1007 keymap.h blockinput.h atimer.h systime.h $(INTERVALS_H) \ |
999 xterm.h w32term.h nsterm.h lisp.h $(config_h) | 1008 xterm.h w32term.h nsterm.h nsgui.h lisp.h $(config_h) |
1000 xdisp.o: xdisp.c macros.h commands.h process.h indent.h buffer.h dispextern.h \ | 1009 xdisp.o: xdisp.c macros.h commands.h process.h indent.h buffer.h dispextern.h \ |
1001 coding.h termchar.h frame.h window.h disptab.h termhooks.h character.h \ | 1010 coding.h termchar.h frame.h window.h disptab.h termhooks.h character.h \ |
1002 charset.h lisp.h $(config_h) keyboard.h $(INTERVALS_H) region-cache.h xterm.h \ | 1011 charset.h lisp.h $(config_h) keyboard.h $(INTERVALS_H) region-cache.h \ |
1003 w32term.h nsterm.h msdos.h composite.h fontset.h ccl.h \ | 1012 xterm.h w32term.h nsterm.h nsgui.h msdos.h composite.h fontset.h ccl.h \ |
1004 blockinput.h atimer.h systime.h keymap.h font.h | 1013 blockinput.h atimer.h systime.h keymap.h font.h |
1005 xfaces.o: xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h \ | 1014 xfaces.o: xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h \ |
1006 window.h character.h charset.h msdos.h dosfns.h composite.h atimer.h \ | 1015 window.h character.h charset.h msdos.h dosfns.h composite.h atimer.h \ |
1007 systime.h keyboard.h fontset.h w32term.h nsterm.h coding.h ccl.h \ | 1016 systime.h keyboard.h fontset.h w32term.h nsterm.h coding.h ccl.h \ |
1008 $(INTERVALS_H) termchar.h termhooks.h font.h lisp.h $(config_h) | 1017 $(INTERVALS_H) nsgui.h termchar.h termhooks.h font.h lisp.h $(config_h) |
1009 xfns.o: xfns.c buffer.h frame.h window.h keyboard.h xterm.h dispextern.h \ | 1018 xfns.o: xfns.c buffer.h frame.h window.h keyboard.h xterm.h dispextern.h \ |
1010 $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h systime.h epaths.h \ | 1019 $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h systime.h epaths.h \ |
1011 character.h charset.h coding.h gtkutil.h lisp.h $(config_h) termhooks.h \ | 1020 character.h charset.h coding.h gtkutil.h lisp.h $(config_h) termhooks.h \ |
1012 fontset.h termchar.h font.h xsettings.h $(INTERVALS_H) ccl.h | 1021 fontset.h termchar.h font.h xsettings.h $(INTERVALS_H) ccl.h |
1013 xfont.o: dispextern.h xterm.h frame.h blockinput.h character.h charset.h \ | 1022 xfont.o: dispextern.h xterm.h frame.h blockinput.h character.h charset.h \ |
1016 font.h lisp.h $(config_h) atimer.h systime.h fontset.h ccl.h ftfont.h | 1025 font.h lisp.h $(config_h) atimer.h systime.h fontset.h ccl.h ftfont.h |
1017 ftxfont.o: dispextern.h xterm.h frame.h blockinput.h character.h charset.h \ | 1026 ftxfont.o: dispextern.h xterm.h frame.h blockinput.h character.h charset.h \ |
1018 font.h lisp.h $(config_h) atimer.h systime.h fontset.h ccl.h | 1027 font.h lisp.h $(config_h) atimer.h systime.h fontset.h ccl.h |
1019 menu.o: menu.c lisp.h keyboard.h keymap.h frame.h termhooks.h blockinput.h \ | 1028 menu.o: menu.c lisp.h keyboard.h keymap.h frame.h termhooks.h blockinput.h \ |
1020 dispextern.h $(srcdir)/../lwlib/lwlib.h xterm.h gtkutil.h menu.h \ | 1029 dispextern.h $(srcdir)/../lwlib/lwlib.h xterm.h gtkutil.h menu.h \ |
1021 lisp.h $(config_h) systime.h coding.h composite.h window.h atimer.h | 1030 lisp.h $(config_h) systime.h coding.h composite.h window.h atimer.h nsgui.h |
1022 xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h buffer.h \ | 1031 xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h buffer.h \ |
1023 charset.h keyboard.h $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h \ | 1032 charset.h keyboard.h $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h \ |
1024 systime.h gtkutil.h msdos.h coding.h menu.h lisp.h $(config_h) composite.h \ | 1033 systime.h gtkutil.h msdos.h coding.h menu.h lisp.h $(config_h) composite.h \ |
1025 keymap.h sysselect.h | 1034 keymap.h sysselect.h |
1026 xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h buffer.h \ | 1035 xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h buffer.h \ |
1074 /* System-specific programs to be made. | 1083 /* System-specific programs to be made. |
1075 OTHER_FILES | 1084 OTHER_FILES |
1076 select which of these should be compiled. */ | 1085 select which of these should be compiled. */ |
1077 | 1086 |
1078 #ifdef HAVE_NS | 1087 #ifdef HAVE_NS |
1079 /* In fact, every .o file depends directly or indirectly on dispextern.h | |
1080 and hence nsgui.h under NS. But the ones that actually use stuff there | |
1081 are more limited. */ | |
1082 dispnew.o font.o fontset.o frame.o fringe.o image.o keyboard.o menu.o \ | |
1083 window.o xdisp.o xfaces.o: nsgui.h | |
1084 | |
1085 ${ns_appdir}: ${ns_appsrc} | 1088 ${ns_appdir}: ${ns_appsrc} |
1086 rm -fr ${ns_appdir} | 1089 rm -fr ${ns_appdir} |
1087 mkdir -p ${ns_appdir} | 1090 mkdir -p ${ns_appdir} |
1088 ( cd ${ns_appsrc} ; tar cfh - . ) | ( cd ${ns_appdir} ; tar xf - ) | 1091 ( cd ${ns_appsrc} ; tar cfh - . ) | ( cd ${ns_appdir} ; tar xf - ) |
1089 ( cd ${ns_appdir} ; for subdir in `find . -type d ! -name CVS -print` ; do \ | 1092 ( cd ${ns_appdir} ; for subdir in `find . -type d ! -name CVS -print` ; do \ |