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 --git a/ChangeLog b/ChangeLog
index f9831c6bcb98294748ccef5144b4ef66afacd868..4bfd985f35336b886052421ceca279e04c1ee8de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 --git a/configure.in b/configure.in
index 84092850bb6eb1299933887fa20bed9a4a94e4ae..520168c24b0d21dbc6d21a20630d63a4d532b4ce 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1452,6 +1452,7 @@ fi
 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 @@ if test "${with_ns}" != no; then
      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 @@ if test "${with_ns}" != no; then
     NS_HAVE_NSINTEGER=no
   fi
 fi
+AC_SUBST(NS_IMPL_GNUSTEP_INC)
 
 NS_OBJ=
 NS_SUPPORT=
@@ -3050,7 +3059,6 @@ AC_SUBST(ns_appdir)
 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 --git a/msdos/ChangeLog b/msdos/ChangeLog
index 50b2e643eb825c99b6fc105aa755671c2ee07759..b40f0dc5c96f305199d952dc7c143ee272182804 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -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 --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 806fc98eb6b6e38d60da3fe72c9830cd059e2221..a89d72644162adaa7674fc63256ec65779fb18cd 100644 (file)
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -109,6 +109,7 @@ s/\.h\.in/.h-in/
 /^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!>.*$!!
 /^[\f   ]*$/d

diff --git a/src/ChangeLog b/src/ChangeLog
index 4ec2629e35fe4e2ce95de88d0b3e2cb06982d388..e329313237cecd762135a984b9e97bfdd2a17154 100644 (file)
--- 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 7765aa708a44c3d34cc7e39c36f8721f9fbad3cb..b9fa57fe1d046fbe5433e4d96557a04325cadf44 100644 (file)
--- 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