From b330336c40599bc7bc2e9d8bdd591cbff62d01e1 Mon Sep 17 00:00:00 2001 From: Adrian Robert Date: Thu, 7 Aug 2008 01:36:30 +0000 Subject: [PATCH] * Makefile.in (emacs): Remove ndef NS conditional for 'emacs -list-load-path-shadows'. (nsgui.h): Reduce number of things depending on it. --- src/ChangeLog | 8 ++++++++ src/Makefile.in | 11 +++++------ src/config.in | 5 +---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 9dd960b50f..5a95dff542 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2008-08-06 Adrian Robert + + * 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 * xdisp.c (try_scrolling): Use iterator to find the scroll margin, diff --git a/src/Makefile.in b/src/Makefile.in index 3edd0af5e1..3a12c7e2e9 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -910,10 +910,7 @@ emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp} ${SOME_MACHINE_LISP} @: 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 @@ composite.o: composite.c buffer.h character.h $(INTERVAL_SRC) $(config_h) 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} diff --git a/src/config.in b/src/config.in index 42c9c8658e..ffa4688462 100644 --- a/src/config.in +++ b/src/config.in @@ -1039,12 +1039,9 @@ along with GNU Emacs. If not, see . */ 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 */ -- 2.20.1