# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1273805169 25200
# Node ID 8039fa319d6b38357e7ce1c29c0bf850239265c7
# Parent  1d7fcf3cf1b257e708679600a82b97456cdc60ae
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.

diff -r 1d7fcf3cf1b2 -r 8039fa319d6b ChangeLog
--- a/ChangeLog	Thu May 13 19:36:46 2010 -0700
+++ b/ChangeLog	Thu May 13 19:46:09 2010 -0700
@@ -1,3 +1,8 @@
+2010-05-14  Glenn Morris  <rgm@gnu.org>
+
+	* configure.in (NS_IMPL_GNUSTEP_INC): New output variable.
+	(GNUSTEP_MAKEFILES): Do not output.
+
 2010-05-13  Glenn Morris  <rgm@gnu.org>
 
 	* configure.in: Fix some paren typos.
diff -r 1d7fcf3cf1b2 -r 8039fa319d6b configure.in
--- a/configure.in	Thu May 13 19:36:46 2010 -0700
+++ b/configure.in	Thu May 13 19:46:09 2010 -0700
@@ -1452,6 +1452,7 @@
 HAVE_NS=no
 NS_IMPL_COCOA=no
 NS_IMPL_GNUSTEP=no
+NS_IMPL_GNUSTEP_INC=
 tmp_CPPFLAGS="$CPPFLAGS"
 tmp_CFLAGS="$CFLAGS"
 CPPFLAGS="$CPPFLAGS -x objective-c"
@@ -1473,6 +1474,13 @@
      GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)"
      GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)"
      GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)"
+     ## Pull in stuff from GNUstep-make.
+     NS_IMPL_GNUSTEP_INC="FOUNDATION_LIB=gnu
+GUI_LIB=gnu
+include $GNUSTEP_MAKEFILES/Additional/base.make
+include $GNUSTEP_MAKEFILES/Additional/gui.make
+shared=no
+"
      CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
      CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
      REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
@@ -1491,6 +1499,7 @@
     NS_HAVE_NSINTEGER=no
   fi
 fi
+AC_SUBST(NS_IMPL_GNUSTEP_INC)
 
 NS_OBJ=
 NS_SUPPORT=
@@ -3050,7 +3059,6 @@
 AC_SUBST(ns_appbindir)
 AC_SUBST(ns_appresdir)
 AC_SUBST(ns_appsrc)
-AC_SUBST(GNUSTEP_MAKEFILES)
 AC_SUBST(GNUSTEP_SYSTEM_HEADERS)
 AC_SUBST(GNUSTEP_SYSTEM_LIBRARIES)
 AC_SUBST(GNU_OBJC_CFLAGS)
diff -r 1d7fcf3cf1b2 -r 8039fa319d6b msdos/ChangeLog
--- a/msdos/ChangeLog	Thu May 13 19:36:46 2010 -0700
+++ b/msdos/ChangeLog	Thu May 13 19:46:09 2010 -0700
@@ -1,3 +1,7 @@
+2010-05-14  Glenn Morris  <rgm@gnu.org>
+
+	* sed1v2.inp (@NS_IMPL_GNUSTEP_INC@): Edit to nil.
+
 2010-05-13  Glenn Morris  <rgm@gnu.org>
 
 	* sed1x.inp (OLDXMENU): Edit to ${oldXMenudir}libXMenu11.a.
diff -r 1d7fcf3cf1b2 -r 8039fa319d6b msdos/sed1v2.inp
--- a/msdos/sed1v2.inp	Thu May 13 19:36:46 2010 -0700
+++ b/msdos/sed1v2.inp	Thu May 13 19:46:09 2010 -0700
@@ -109,6 +109,7 @@
 /^M_FILE *=/s!@[^@\n]*@!m/intel386.h!
 /^S_FILE *=/s!@[^@\n]*@!s/msdos.h!
 /^@SET_MAKE@$/s/@SET_MAKE@//
+/^@NS_IMPL_GNUSTEP_INC@/s/@NS_IMPL_GNUSTEP_INC@//
 /^.\${libsrc}make-docfile.*>/s!make-docfile!make-docfile -o ../etc/DOC!
 /^.\${libsrc}make-doc/s!>.*$!!
 /^[ 	]*$/d
diff -r 1d7fcf3cf1b2 -r 8039fa319d6b src/ChangeLog
--- a/src/ChangeLog	Thu May 13 19:36:46 2010 -0700
+++ b/src/ChangeLog	Thu May 13 19:46:09 2010 -0700
@@ -1,7 +1,9 @@
 2010-05-14  Glenn Morris  <rgm@gnu.org>
 
+	* Makefile.in (@NS_IMPL_GNUSTEP_INC@): Use in place of #ifdef.
+	(ns_appresdir): Remove, unused.
+
 	* Makefile.in (SHELL): Move outside cpp section.
-	(ns_appresdir): Remove, unused.
 
 	* s/netbsd.h (AMPERSAND_FULL_NAME): Remove (defined in AH_BOTTOM).
 
diff -r 1d7fcf3cf1b2 -r 8039fa319d6b src/Makefile.in
--- a/src/Makefile.in	Thu May 13 19:36:46 2010 -0700
+++ b/src/Makefile.in	Thu May 13 19:46:09 2010 -0700
@@ -247,14 +247,8 @@
    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