Mercurial > emacs
changeset 97345:0b4b1b4344af
* Makefile.in (emacs): Remove ndef NS conditional for 'emacs -list-load-path-shadows'. (nsgui.h): Reduce number of things depending on it.
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Thu, 07 Aug 2008 01:36:30 +0000 |
| parents | ac1bfb10ff9e |
| children | 6bd54c1d95e1 |
| files | src/ChangeLog src/Makefile.in src/config.in |
| diffstat | 3 files changed, 14 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Aug 07 01:33:34 2008 +0000 +++ b/src/ChangeLog Thu Aug 07 01:36:30 2008 +0000 @@ -1,3 +1,11 @@ +2008-08-06 Adrian Robert <Adrian.B.Robert@gmail.com> + + * config.in: Regenerate. + + * Makefile.in (emacs): Remove ndef NS conditional for 'emacs + -list-load-path-shadows'. + (nsgui.h): Reduce number of things depending on it. + 2008-08-06 Chong Yidong <cyd@stupidchicken.com> * xdisp.c (try_scrolling): Use iterator to find the scroll margin,
--- a/src/Makefile.in Thu Aug 07 01:33:34 2008 +0000 +++ b/src/Makefile.in Thu Aug 07 01:36:30 2008 +0000 @@ -910,10 +910,7 @@ @: bootstrap-emacs, so let us replace it. -ln -f emacs${EXEEXT} bootstrap-emacs${EXEEXT} #endif /* ! defined (CANNOT_DUMP) */ -/* XXX: not working under NS currently due to path shenanigans.. */ -#ifndef HAVE_NS -./emacs -q -batch -f list-load-path-shadows -#endif /* We run make-docfile twice because the command line may get too long on some systems. */ @@ -1252,9 +1249,11 @@ select which of these should be compiled. */ #ifdef HAVE_NS -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 +/* In fact, every .o file depends directly or indirectly on dispextern.h + and hence nsgui.h under NS. But the ones that actually use stuff there + are more limited. */ +dispnew.o font.o fontset.o frame.o fringe.o image.o keyboard.o menu.o \ + window.o xdisp.o xfaces.o: nsgui.h ${ns_appdir}: ${ns_appsrc} rm -fr ${ns_appdir}
--- a/src/config.in Thu Aug 07 01:33:34 2008 +0000 +++ b/src/config.in Thu Aug 07 01:36:30 2008 +0000 @@ -1039,12 +1039,9 @@ side does this in s/darwin.h and we cannot parallel this exactly since GNUstep is multi-OS. */ #ifdef HAVE_NS -# ifdef C_SWITCH_SYSTEM -# undef C_SWITCH_SYSTEM -# endif # ifdef NS_IMPL_GNUSTEP /* See also .m.o rule in Makefile.in */ -# define C_SWITCH_X_SYSTEM -MMD -MP -D_REENTRANT -fPIC -fno-strict-aliasing +# define C_SWITCH_X_SYSTEM -D_REENTRANT -fPIC -fno-strict-aliasing # define GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE # define OTHER_FILES ns-app # else /* NS_IMPL_COCOA */