[Emacs-diffs] /srv/bzr/emacs/trunk r100324: Simplify temacs build rule.

[Glenn Morris]

------------------------------------------------------------
revno: 100324
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2010-05-16 10:58:27 -0700
message:
  Simplify temacs build rule.
  
  * configure.in (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New output variable.
  (START_FILES): Set to empty if NS_IMPL_GNUSTEP.
  (GNUSTEP_SYSTEM_HEADERS, GNUSTEP_SYSTEM_LIBRARIES): Do not output,
  nothing uses.
  
  * configure: Regenerate.
  
  * src/Makefile.in (GNUSTEP_SYSTEM_LIBRARIES): Remove, unused.
  (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New, set by configure.
  (LD) [NS_IMPL_GNUSTEP]: Set to $(CC) -rdynamic.
  (temacs${EXEEXT}): Remove $LOCALCPP, never defined or referenced.
  Make most of the NS_IMPL_GNUSTEP case the same as the default case.
  
  * msdos/sed1v2.inp (GNUSTEP_SYSTEM_LIBRARIES): Remove.
  (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): Edit to empty.
modified:
  ChangeLog
  configure
  configure.in
  msdos/ChangeLog
  msdos/sed1v2.inp
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-05-16 05:58:55 +0000
+++ b/ChangeLog 2010-05-16 17:58:27 +0000
@@ -1,3 +1,10 @@
+2010-05-16  Glenn Morris  <address@hidden>
+
+       * configure.in (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New output variable.
+       (START_FILES): Set to empty if NS_IMPL_GNUSTEP.
+       (GNUSTEP_SYSTEM_HEADERS, GNUSTEP_SYSTEM_LIBRARIES): Do not output,
+       nothing uses.
+
 2010-05-16  Dan Nicolaescu  <address@hidden>
 
        * configure.in: Remove references to usg5-4 and bsd-common, $opsys

=== modified file 'configure'
--- a/configure 2010-05-16 05:58:55 +0000
+++ b/configure 2010-05-16 17:58:27 +0000
@@ -718,6 +718,7 @@
 LD_SWITCH_X_SITE_AUX
 LD_SWITCH_X_SITE_AUX_RPATH
 NS_IMPL_GNUSTEP_INC
+NS_IMPL_GNUSTEP_TEMACS_LDFLAGS
 NS_OBJ
 NS_SUPPORT
 LIB_STANDARD
@@ -795,8 +796,6 @@
 ns_appbindir
 ns_appresdir
 ns_appsrc
-GNUSTEP_SYSTEM_HEADERS
-GNUSTEP_SYSTEM_LIBRARIES
 GNU_OBJC_CFLAGS
 OTHER_FILES
 FONT_OBJ
@@ -9933,6 +9932,7 @@
 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"
@@ -9960,11 +9960,13 @@
 include $GNUSTEP_MAKEFILES/Additional/gui.make
 shared=no
 "
+          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}"
      LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}"
      LIB_STANDARD=
+     START_FILES=
   fi
   if test "${ac_cv_header_AppKit_AppKit_h+set}" = set; then
   { $as_echo "$as_me:$LINENO: checking for AppKit/AppKit.h" >&5
@@ -10153,6 +10155,7 @@
 fi
 
 
+
 NS_OBJ=
 NS_SUPPORT=
 if test "${HAVE_NS}" = yes; then
@@ -21594,7 +21597,7 @@
 
 ## Use terminfo instead of termcap?
 ## Note only system files NOT using terminfo are:
-## bsd-common, freebsd < 40000, ms-w32, msdos, netbsd, and
+## freebsd < 40000, ms-w32, msdos, netbsd, and
 ## darwin|gnu without ncurses.
 TERMINFO=no
 LIBS_TERMCAP=
@@ -26359,8 +26362,6 @@
 
 
 
-
-
 cat >>confdefs.h <<_ACEOF
 #define EMACS_CONFIGURATION "${canonical}"
 _ACEOF

=== modified file 'configure.in'
--- a/configure.in      2010-05-16 05:58:55 +0000
+++ b/configure.in      2010-05-16 17:58:27 +0000
@@ -1453,6 +1453,7 @@
 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"
@@ -1481,11 +1482,14 @@
 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}"
      LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}"
      LIB_STANDARD=
+     START_FILES=
   fi
   AC_CHECK_HEADER([AppKit/AppKit.h], [HAVE_NS=yes],
                  [AC_MSG_ERROR([`--with-ns' was specified, but the include
@@ -1500,6 +1504,7 @@
   fi
 fi
 AC_SUBST(NS_IMPL_GNUSTEP_INC)
+AC_SUBST(NS_IMPL_GNUSTEP_TEMACS_LDFLAGS)
 
 NS_OBJ=
 NS_SUPPORT=
@@ -3051,8 +3056,6 @@
 AC_SUBST(ns_appbindir)
 AC_SUBST(ns_appresdir)
 AC_SUBST(ns_appsrc)
-AC_SUBST(GNUSTEP_SYSTEM_HEADERS)
-AC_SUBST(GNUSTEP_SYSTEM_LIBRARIES)
 AC_SUBST(GNU_OBJC_CFLAGS)
 AC_SUBST(OTHER_FILES)
 

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2010-05-15 22:33:24 +0000
+++ b/msdos/ChangeLog   2010-05-16 17:58:27 +0000
@@ -1,3 +1,8 @@
+2010-05-16  Glenn Morris  <address@hidden>
+
+       * sed1v2.inp (GNUSTEP_SYSTEM_LIBRARIES): Remove.
+       (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): Edit to empty.
+
 2010-05-15  Glenn Morris  <address@hidden>
 
        * sed1v2.inp (LIBXMENU): Edit to empty.

=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp  2010-05-15 22:33:24 +0000
+++ b/msdos/sed1v2.inp  2010-05-16 17:58:27 +0000
@@ -99,7 +99,6 @@
 /^NS_OBJ *=/s/@NS_OBJ@//
 /^NS_SUPPORT *=/s/@NS_SUPPORT@//
 /^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@//
-/^GNUSTEP_SYSTEM_LIBRARIES *=/s/@GNUSTEP_SYSTEM_LIBRARIES@//
 /^LIBRESOLV *=/s/@LIBRESOLV@//
 /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@//
 /^GETLOADAVG_LIBS *=/s/@address@hidden@//
@@ -123,6 +122,7 @@
 /^S_FILE *=/address@hidden@address@hidden/msdos.h!
 /address@hidden@$/s/@SET_MAKE@//
 /address@hidden@/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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-16 06:40:19 +0000
+++ b/src/ChangeLog     2010-05-16 17:58:27 +0000
@@ -1,5 +1,11 @@
 2010-05-16  Glenn Morris  <address@hidden>
 
+       * Makefile.in (GNUSTEP_SYSTEM_LIBRARIES): Remove, unused.
+       (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New, set by configure.
+       (LD) [NS_IMPL_GNUSTEP]: Set to $(CC) -rdynamic.
+       (temacs${EXEEXT}): Remove $LOCALCPP, never defined or referenced.
+       Make most of the NS_IMPL_GNUSTEP case the same as the default case.
+
        * Makefile.in (temacs${EXEEXT}) [!NS_IMPL_GNUSTEP]:
        Remove ${STARTFLAGS}, nothing ever sets it.
 

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-05-16 06:40:19 +0000
+++ b/src/Makefile.in   2010-05-16 17:58:27 +0000
@@ -226,9 +226,8 @@
 address@hidden@
 address@hidden@
 address@hidden@
-## Next two only set if NS_IMPL_GNUSTEP.
+## Only set if NS_IMPL_GNUSTEP.
 address@hidden@
address@hidden@
 
 ## Empty if !HAVE_X_WINDOWS
 ## xfont.o ftfont.o xftfont.o ftxfont.o if HAVE_XFT
@@ -287,6 +286,10 @@
 /* If NS_IMPL_GNUSTEP, some definitions and includes are expanded here.  */
 @NS_IMPL_GNUSTEP_INC@
 
+/* FIXME move to LD_SWITCH_SYSTEM_TEMACS?
+   This uses ${CONFIG_SYSTEM_LIBS}, presumably set by the above include.  */
address@hidden@
+
 /* DO NOT use -R.  There is a special hack described in lastfile.c
    which is used instead.  Some initialized data areas are modified
    at initial startup, then labeled as part of the text area when
@@ -357,6 +360,12 @@
 
 #endif /* not ORDINARY_LINK */
 
+
+#ifdef NS_IMPL_GNUSTEP
+LD=$(CC) -rdynamic
+#endif
+
+
 /* lastfile must follow all files whose initialized data areas should
    be dumped as pure by dump-emacs.  */
 obj=    dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \
@@ -670,16 +679,16 @@
 buildobj.h: Makefile
        echo "#define BUILDOBJ \"${obj} ${otherobj} " "\"" > buildobj.h
 
-/* FIXME LOCALCPP not defined or mentioned anywhere.  */
-temacs${EXEEXT}: $(LOCALCPP) $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} 
prefix-args${EXEEXT}
+temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} 
prefix-args${EXEEXT}
 #ifdef NS_IMPL_GNUSTEP
-       $(CC) -rdynamic YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \
-       -L$(GNUSTEP_SYSTEM_LIBRARIES) -lgnustep-gui -lgnustep-base \
-       -lobjc $(CONFIG_SYSTEM_LIBS) -lpthread ) -o temacs \
-       ${obj} ${otherobj} ${LIBES}
+       $(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \
+         ${NS_IMPL_GNUSTEP_TEMACS_LDFLAGS} ) \
+         -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES}
 #else
-       $(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} ) $(LDFLAGS) \
-       -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES}
+       $(LD) YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \
+         ${NS_IMPL_GNUSTEP_TEMACS_LDFLAGS} ) \
+         ${LDFLAGS} \
+         -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES}
 #endif
 
 prefix-args${EXEEXT}: prefix-args.o $(config_h)