Mercurial > emacs
changeset 97335:5814e7199b5e
* config.in: Regenerate. * Makefile.in: Move nsXXX.m dependencies into big alphabetical list. (mostlyclean): Don't delete *.d under NS. * nsterm.h (NS_HAVE_INTEGER): Change to NS_HAVE_NSINTEGER.
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Wed, 06 Aug 2008 16:20:46 +0000 |
| parents | 07a0633dcf4c |
| children | 701c14eb5b26 |
| files | src/ChangeLog src/Makefile.in src/config.in src/nsterm.h |
| diffstat | 4 files changed, 25 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Aug 06 16:19:43 2008 +0000 +++ b/src/ChangeLog Wed Aug 06 16:20:46 2008 +0000 @@ -1,3 +1,12 @@ +2008-08-06 Adrian Robert <Adrian.B.Robert@gmail.com> + + * config.in: Regenerate. + + * Makefile.in: Move nsXXX.m dependencies into big alphabetical list. + (mostlyclean): Don't delete *.d under NS. + + * nsterm.h (NS_HAVE_INTEGER): Change to NS_HAVE_NSINTEGER. + 2008-08-06 Kenichi Handa <handa@m17n.org> * xfont.c (xfont_list_family): Return a list of symbols, not
--- a/src/Makefile.in Wed Aug 06 16:19:43 2008 +0000 +++ b/src/Makefile.in Wed Aug 06 16:20:46 2008 +0000 @@ -1115,6 +1115,19 @@ msdos.o: msdos.c msdos.h dosfns.h systime.h termhooks.h dispextern.h frame.h \ termopts.h termchar.h character.h coding.h ccl.h disptab.h window.h \ keyboard.h intervals.h buffer.h commands.h blockinput.h atimer.h $(config_h) +nsfns.o: nsfns.m charset.h nsterm.h nsgui.h frame.h window.h buffer.h \ + dispextern.h nsgui.h fontset.h $(INTERVAL_SRC) keyboard.h blockinput.h \ + atimer.h systime.h epaths.h termhooks.h coding.h systime.h $(config_h) +nsfont.o: nsterm.h dispextern.h frame.h lisp.h $(config_h) +nsimage.o: nsimage.m nsterm.h $(config_h) +nsmenu.o: nsmenu.m termhooks.h frame.h window.h dispextern.h \ + nsgui.h keyboard.h blockinput.h atimer.h systime.h buffer.h \ + nsterm.h $(config_h) +nsterm.o: nsterm.m blockinput.h atimer.h systime.h syssignal.h nsterm.h \ + nsgui.h frame.h charset.h ccl.h dispextern.h fontset.h termhooks.h \ + termopts.h termchar.h disptab.h buffer.h window.h keyboard.h \ + $(INTERVAL_SRC) process.h coding.h $(config_h) +nsselect.o: nsselect.m blockinput.h nsterm.h nsgui.h frame.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 \ @@ -1242,19 +1255,6 @@ 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 sound.o: nsgui.h -nsfns.o: nsfns.m charset.h nsterm.h nsgui.h frame.h window.h buffer.h \ - dispextern.h nsgui.h fontset.h $(INTERVAL_SRC) keyboard.h blockinput.h \ - atimer.h systime.h epaths.h termhooks.h coding.h systime.h $(config_h) -nsmenu.o: nsmenu.m termhooks.h frame.h window.h dispextern.h \ - nsgui.h keyboard.h blockinput.h atimer.h systime.h buffer.h \ - nsterm.h $(config_h) -nsterm.o: nsterm.m blockinput.h atimer.h systime.h syssignal.h nsterm.h \ - nsgui.h frame.h charset.h ccl.h dispextern.h fontset.h termhooks.h \ - termopts.h termchar.h disptab.h buffer.h window.h keyboard.h \ - $(INTERVAL_SRC) process.h coding.h $(config_h) -nsselect.o: nsselect.m blockinput.h nsterm.h nsgui.h frame.h $(config_h) -nsimage.o: nsimage.m nsterm.h -nsfont.o: nsterm.h dispextern.h frame.h lisp.h $(config_h) ${ns_appdir}: ${ns_appsrc} rm -fr ${ns_appdir} @@ -1282,9 +1282,6 @@ rm -f emacs-*.*.*${EXEEXT} emacs${EXEEXT} #ifdef HAVE_NS rm -fr ${ns_appdir} -#ifdef NS_IMPL_GNUSTEP - rm -f *.d -#endif #endif /* bootstrap-clean is used to clean up just before a bootstrap. It should remove all files generated during a compilation/bootstrap,
--- a/src/config.in Wed Aug 06 16:19:43 2008 +0000 +++ b/src/config.in Wed Aug 06 16:20:46 2008 +0000 @@ -810,7 +810,7 @@ #undef NO_MATHERR /* Define to 1 if `NSInteger' is defined. */ -#undef NS_HAVE_INTEGER +#undef NS_HAVE_NSINTEGER /* Define to 1 if you are using NS windowing under MacOS X. */ #undef NS_IMPL_COCOA
--- a/src/nsterm.h Wed Aug 06 16:19:43 2008 +0000 +++ b/src/nsterm.h Wed Aug 06 16:20:46 2008 +0000 @@ -364,10 +364,10 @@ @end #endif -#ifndef NS_HAVE_INTEGER +#ifndef NS_HAVE_NSINTEGER typedef long NSInteger; typedef unsigned long NSUInteger; -#endif /* not NS_HAVE_INTEGER */ +#endif /* not NS_HAVE_NSINTEGER */ #endif /* __OBJC__ */