From ccd89fb3d6475cae1df64a64f87977c21e98389b Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 25 May 2010 20:42:07 -0700 Subject: [PATCH] Remove some NS_IMPL_GNUSTEP build dead code. * configure.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS) (GNUSTEP_MAKEFILES): Remove. (LD_SWITCH_SYSTEM_TEMACS): Move NS_IMPL_GNUSTEP_TEMACS_LDFLAGS stuff to here. * src/Makefile.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): Remove. (TEMACS_LDFLAGS): Do not use NS_IMPL_GNUSTEP_TEMACS_LDFLAGS. * msdos/sed1v2.inp (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): No longer present. Comments: See http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00846.html. Nothing from gui.make was used at all in src/Makefile.in. The only thing used from base.make was $CONFIG_SYSTEM_LIBS, but because we only set shared _after_ sourcing base.make, it was always empty. We can move the remaining flags, set in configure, to the standard variable LD_SWITCH_SYSTEM_TEMACS. --- ChangeLog | 7 +++++++ configure.in | 22 ++++++---------------- msdos/ChangeLog | 5 +++++ msdos/sed1v2.inp | 2 -- src/ChangeLog | 6 ++++++ src/Makefile.in | 8 +------- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0d014c28931..a0b6370c3ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-05-26 Glenn Morris + + * configure.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS) + (GNUSTEP_MAKEFILES): Remove. + (LD_SWITCH_SYSTEM_TEMACS): Move NS_IMPL_GNUSTEP_TEMACS_LDFLAGS + stuff to here. + 2010-05-25 Glenn Morris * configure.in (LD_SWITCH_SYSTEM): Move some gnu-linux stuff... diff --git a/configure.in b/configure.in index 13b550e005c..677080603da 100644 --- a/configure.in +++ b/configure.in @@ -1468,8 +1468,6 @@ fi HAVE_NS=no NS_IMPL_COCOA=no NS_IMPL_GNUSTEP=no -NS_IMPL_GNUSTEP_INC= -NS_IMPL_GNUSTEP_TEMACS_LDFLAGS= tmp_CPPFLAGS="$CPPFLAGS" tmp_CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS -x objective-c" @@ -1491,20 +1489,9 @@ if test "${with_ns}" != no; then ns_appbindir=${ns_appdir} ns_appresdir=${ns_appdir}Resources ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base - dnl FIXME sourcing this 3 times in subshells seems inefficient. - GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)" + dnl FIXME sourcing this several times in subshells seems inefficient. 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. - ## FIXME? Cleaner to use AC_SUBST_FILE for this? - NS_IMPL_GNUSTEP_INC="FOUNDATION_LIB=gnu -GUI_LIB=gnu -include $GNUSTEP_MAKEFILES/Additional/base.make -include $GNUSTEP_MAKEFILES/Additional/gui.make -shared=no -" - dnl Presumably ${CONFIG_SYSTEM_LIBS} is defined by above includes. - NS_IMPL_GNUSTEP_TEMACS_LDFLAGS="-L${GNUSTEP_SYSTEM_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc \${CONFIG_SYSTEM_LIBS} -lpthread" CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" @@ -1525,8 +1512,6 @@ shared=no NS_HAVE_NSINTEGER=no fi fi -AC_SUBST(NS_IMPL_GNUSTEP_INC) -AC_SUBST(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS) AC_SUBST(TEMACS_LDFLAGS2) ns_frag=/dev/null @@ -3311,6 +3296,11 @@ case "$opsys" in *) LD_SWITCH_SYSTEM_TEMACS= ;; esac + +if test "$NS_IMPL_GNUSTEP=yes"; then + LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} -L${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread" +fi + AC_SUBST(LD_SWITCH_SYSTEM_TEMACS) diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 8c94734a44f..db8a37896b8 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,8 @@ +2010-05-26 Glenn Morris + + * sed1v2.inp (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): + No longer present. + 2010-05-25 Glenn Morris * sed1v2.inp (LD_SWITCH_SYSTEM_EXTRA): No longer present. diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 5317e8246f3..eec6be62195 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -129,8 +129,6 @@ 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@// -/^NS_IMPL_GNUSTEP_TEMACS_LDFLAGS *=/s/@NS_IMPL_GNUSTEP_TEMACS_LDFLAGS@// /^.\${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 d451e873adb..ba513b1bcf2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2010-05-26 Glenn Morris + + * Makefile.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): + Remove. + (TEMACS_LDFLAGS): Do not use NS_IMPL_GNUSTEP_TEMACS_LDFLAGS. + 2010-05-26 Kenichi Handa * composite.c (composition_compute_stop_pos): Fix condition for diff --git a/src/Makefile.in b/src/Makefile.in index 0a2d1d0a8ab..bbe573e69be 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -111,14 +111,8 @@ LD_SWITCH_SYSTEM=@LD_SWITCH_SYSTEM@ ## which are only good with temacs. LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@ -## If NS_IMPL_GNUSTEP, some definitions and includes are expanded here. -@NS_IMPL_GNUSTEP_INC@ - -## This uses ${CONFIG_SYSTEM_LIBS} from NS_IMPL_GNUSTEP_INC. -NS_IMPL_GNUSTEP_TEMACS_LDFLAGS=@NS_IMPL_GNUSTEP_TEMACS_LDFLAGS@ - ## Flags to pass to ld only for temacs. -TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS) $(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS) +TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS) ## $LDFLAGS, or empty if NS_IMPL_GNUSTEP (for some reason). TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@ -- 2.39.2