Minor build simplification for NS.

* configure.in (NS_IMPL_GNUSTEP_INC): New output variable.
(GNUSTEP_MAKEFILES): Do not output.

* src/Makefile.in (@NS_IMPL_GNUSTEP_INC@): Use in place of #ifdef.

* msdos/sed1v2.inp (@NS_IMPL_GNUSTEP_INC@): Edit to nil.

2 files changed, 5 insertions, 9 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4ec2629e35f..e329313237c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,10 @@
 2010-05-14  Glenn Morris  <rgm@gnu.org>
 
-        * Makefile.in (SHELL): Move outside cpp section.
+        * Makefile.in (@NS_IMPL_GNUSTEP_INC@): Use in place of #ifdef.
         (ns_appresdir): Remove, unused.
 
+        * Makefile.in (SHELL): Move outside cpp section.
+
         * s/netbsd.h (AMPERSAND_FULL_NAME): Remove (defined in AH_BOTTOM).
 
 2010-05-13  Glenn Morris  <rgm@gnu.org>
diff --git a/src/Makefile.in b/src/Makefile.in
index 7765aa708a4..b9fa57fe1d0 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -247,14 +247,8 @@ DEPFLAGS = -MMD -MF deps/$*.d
    do not let it interfere with this file.  */
 #undef register
 
-#ifdef NS_IMPL_GNUSTEP
-/* Pull in stuff from GNUstep-make.  */
-FOUNDATION_LIB=gnu
-GUI_LIB=gnu
-include @GNUSTEP_MAKEFILES@/Additional/base.make
-include @GNUSTEP_MAKEFILES@/Additional/gui.make
-shared=no
-#endif
+/* If NS_IMPL_GNUSTEP, some definitions and includes are expanded here.  */
+@NS_IMPL_GNUSTEP_INC@
 
 /* DO NOT use -R.  There is a special hack described in lastfile.c
    which is used instead.  Some initialized data areas are modified