From 489d31a4552ef516721376d7a43b149650abd7a8 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 13 May 2010 19:46:09 -0700 Subject: [PATCH] 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. --- ChangeLog | 5 +++++ configure.in | 10 +++++++++- msdos/ChangeLog | 4 ++++ msdos/sed1v2.inp | 1 + src/ChangeLog | 4 +++- src/Makefile.in | 10 ++-------- 6 files changed, 24 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9831c6bcb9..4bfd985f353 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-05-14 Glenn Morris + + * configure.in (NS_IMPL_GNUSTEP_INC): New output variable. + (GNUSTEP_MAKEFILES): Do not output. + 2010-05-13 Glenn Morris * configure.in: Fix some paren typos. diff --git a/configure.in b/configure.in index 84092850bb6..520168c24b0 100644 --- 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 50b2e643eb8..b40f0dc5c96 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,7 @@ +2010-05-14 Glenn Morris + + * sed1v2.inp (@NS_IMPL_GNUSTEP_INC@): Edit to nil. + 2010-05-13 Glenn Morris * sed1x.inp (OLDXMENU): Edit to ${oldXMenudir}libXMenu11.a. diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 806fc98eb6b..a89d7264416 100644 --- 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!>.*$!! /^[ ]*$/d 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 - * 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 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 -- 2.39.2