procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor build simplification for NS.

Browse source 
* 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.
This commit is contained in:
Glenn Morris 2010-05-13 19:46:09 -07:00
parent 845612ac6c
commit 489d31a455
6 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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.

10
configure.in
View file

@ -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)

4
msdos/ChangeLog
View file

@ -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.

1
msdos/sed1v2.inp
View file

@ -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

4
src/ChangeLog
View file

@ -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>

10
src/Makefile.in
View file

@ -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