Mercurial > emacs
changeset 108546:8039fa319d6b
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.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Thu, 13 May 2010 19:46:09 -0700 |
| parents | 1d7fcf3cf1b2 |
| children | 29bd94ba8c02 |
| files | ChangeLog configure.in msdos/ChangeLog msdos/sed1v2.inp src/ChangeLog src/Makefile.in |
| diffstat | 6 files changed, 24 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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)
--- 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.
--- 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
--- 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).
--- 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