[Emacs-diffs] emacs ChangeLog configure configure.in src/Chan...

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/09/17 06:10:47

Modified files:
        .              : ChangeLog configure configure.in 
        src            : ChangeLog Makefile.in config.in puresize.h 

Log message:
        * puresize.h (BASE_PURESIZE): Increase to 1290000.
        
        * Makefile.in (OTHER_FILES): Define using autoconf, not cpp.
        (OBJECTS_MACHINE): Remove, unused.
        
        * configure.in (OTHER_FILES): Define using autoconf not cpp.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/ChangeLog?cvsroot=emacs&r1=1.851&r2=1.852
http://cvs.savannah.gnu.org/viewcvs/emacs/configure?cvsroot=emacs&r1=1.330&r2=1.331
http://cvs.savannah.gnu.org/viewcvs/emacs/configure.in?cvsroot=emacs&r1=1.607&r2=1.608
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7748&r2=1.7749
http://cvs.savannah.gnu.org/viewcvs/emacs/src/Makefile.in?cvsroot=emacs&r1=1.446&r2=1.447
http://cvs.savannah.gnu.org/viewcvs/emacs/src/config.in?cvsroot=emacs&r1=1.275&r2=1.276
http://cvs.savannah.gnu.org/viewcvs/emacs/src/puresize.h?cvsroot=emacs&r1=1.115&r2=1.116

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/ChangeLog,v
retrieving revision 1.851
retrieving revision 1.852
diff -u -b -r1.851 -r1.852
--- ChangeLog   14 Sep 2009 23:24:56 -0000      1.851
+++ ChangeLog   17 Sep 2009 06:10:44 -0000      1.852
@@ -1,3 +1,7 @@
+2009-09-17  Dan Nicolaescu  <address@hidden>
+
+       * configure.in (OTHER_FILES): Define using autoconf not cpp.
+
 2009-09-14  Dan Nicolaescu  <address@hidden>
 
        * .dir-locals.el (change-log-mode): Restore bug-reference-mode.

Index: configure
===================================================================
RCS file: /cvsroot/emacs/emacs/configure,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -b -r1.330 -r1.331
--- configure   23 Aug 2009 02:15:00 -0000      1.330
+++ configure   17 Sep 2009 06:10:44 -0000      1.331
@@ -764,6 +764,7 @@
 GNUSTEP_SYSTEM_LIBRARIES
 GNU_OBJC_CFLAGS
 LIB_SRC_EXTRA_INSTALLABLES
+OTHER_FILES
 LTLIBOBJS'
 ac_subst_files=''
 ac_user_opts='
@@ -15615,6 +15616,7 @@
   fi
   # We also have mouse menus.
   HAVE_MENUS=yes
+  OTHER_FILES=ns-app
 fi
 
 

Index: configure.in
===================================================================
RCS file: /cvsroot/emacs/emacs/configure.in,v
retrieving revision 1.607
retrieving revision 1.608
diff -u -b -r1.607 -r1.608
--- configure.in        23 Aug 2009 02:15:00 -0000      1.607
+++ configure.in        17 Sep 2009 06:10:46 -0000      1.608
@@ -2188,6 +2188,7 @@
   fi
   # We also have mouse menus.
   HAVE_MENUS=yes
+  OTHER_FILES=ns-app
 fi
 
 
@@ -2598,6 +2599,7 @@
 AC_SUBST(GNUSTEP_SYSTEM_LIBRARIES)
 AC_SUBST(GNU_OBJC_CFLAGS)
 AC_SUBST(LIB_SRC_EXTRA_INSTALLABLES)
+AC_SUBST(OTHER_FILES)
 
 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION,  "${canonical}",
                   [Define to the canonical Emacs configuration name.])
@@ -2744,7 +2746,6 @@
    side does this in s/darwin.h and we cannot
    parallel this exactly since GNUstep is multi-OS. */
 #ifdef HAVE_NS
-#define OTHER_FILES ns-app
 # ifdef NS_IMPL_GNUSTEP
 /* See also .m.o rule in Makefile.in */
 /* FIXME: are all these flags really needed?  Document here why.  */

Index: src/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7748
retrieving revision 1.7749
diff -u -b -r1.7748 -r1.7749
--- src/ChangeLog       16 Sep 2009 20:36:54 -0000      1.7748
+++ src/ChangeLog       17 Sep 2009 06:10:46 -0000      1.7749
@@ -1,3 +1,10 @@
+2009-09-17  Dan Nicolaescu  <address@hidden>
+
+       * puresize.h (BASE_PURESIZE): Increase to 1290000.
+
+       * Makefile.in (OTHER_FILES): Define using autoconf, not cpp.
+       (OBJECTS_MACHINE): Remove, unused.
+
 2009-09-16  Stefan Monnier  <address@hidden>
 
        * frame.c (x_get_resource_string): Remove unused.

Index: src/Makefile.in
===================================================================
RCS file: /cvsroot/emacs/emacs/src/Makefile.in,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -b -r1.446 -r1.447
--- src/Makefile.in     26 Aug 2009 08:28:25 -0000      1.446
+++ src/Makefile.in     17 Sep 2009 06:10:47 -0000      1.447
@@ -65,6 +65,8 @@
 
 bootstrap_exe = ../src/bootstrap-emacs${EXEEXT}
 
+OTHER_FILES = @OTHER_FILES@
+
 # ========================== start of cpp stuff =======================
 /* From here on, comments must be done in C syntax.  */
 
@@ -886,23 +888,13 @@
    @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \
    $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
 
-/* Enable recompilation of certain other files depending on system type.  */
-
-#ifndef OTHER_FILES
-#define OTHER_FILES
-#endif
-
-#ifndef OBJECTS_MACHINE
-#define OBJECTS_MACHINE
-#endif
-
 #ifdef HAVE_SHM
 RUN_TEMACS = `/bin/pwd`/temacs -nl
 #else
 RUN_TEMACS = `/bin/pwd`/temacs
 #endif
 
-all: emacs${EXEEXT} OTHER_FILES
+all: emacs${EXEEXT} $(OTHER_FILES)
 
 emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp} ${SOME_MACHINE_LISP}
 #ifdef CANNOT_DUMP
@@ -939,18 +931,18 @@
        cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile${EXEEXT}
 
 buildobj.h: Makefile
-       echo "#define BUILDOBJ \"${obj} ${otherobj} " OBJECTS_MACHINE "\"" > 
buildobj.h
+       echo "#define BUILDOBJ \"${obj} ${otherobj} " "\"" > buildobj.h
 
-temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} 
OBJECTS_MACHINE prefix-args${EXEEXT}
+temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} 
prefix-args${EXEEXT}
 #ifdef NS_IMPL_GNUSTEP
        $(CC) -rdynamic YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \
        address@hidden@ -lgnustep-gui -lgnustep-base \
        -lobjc $(CONFIG_SYSTEM_LIBS) -lpthread ) -o temacs \
-       ${obj} ${otherobj} OBJECTS_MACHINE ${LIBES}
+       ${obj} ${otherobj} ${LIBES}
 #else
        $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \
     -o temacs ${STARTFILES} ${obj} ${otherobj}  \
-    OBJECTS_MACHINE ${LIBES}
+    ${LIBES}
 #endif
 
 /* We do not use ALL_LDFLAGS because LD_SWITCH_SYSTEM and LD_SWITCH_MACHINE
@@ -1256,7 +1248,7 @@
        $(config_h)
 
 /* System-specific programs to be made.
-   OTHER_FILES and OBJECTS_MACHINE
+   OTHER_FILES
    select which of these should be compiled.  */
 
 #ifdef HAVE_NS

Index: src/config.in
===================================================================
RCS file: /cvsroot/emacs/emacs/src/config.in,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -b -r1.275 -r1.276
--- src/config.in       22 Aug 2009 08:54:08 -0000      1.275
+++ src/config.in       17 Sep 2009 06:10:47 -0000      1.276
@@ -1064,7 +1064,6 @@
    side does this in s/darwin.h and we cannot
    parallel this exactly since GNUstep is multi-OS. */
 #ifdef HAVE_NS
-#define OTHER_FILES ns-app
 # ifdef NS_IMPL_GNUSTEP
 /* See also .m.o rule in Makefile.in */
 /* FIXME: are all these flags really needed?  Document here why.  */

Index: src/puresize.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/puresize.h,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- src/puresize.h      7 Aug 2009 13:54:35 -0000       1.115
+++ src/puresize.h      17 Sep 2009 06:10:47 -0000      1.116
@@ -41,7 +41,7 @@
 #endif
 
 #ifndef BASE_PURESIZE
-#define BASE_PURESIZE (1270000 + SYSTEM_PURESIZE_EXTRA + 
SITELOAD_PURESIZE_EXTRA)
+#define BASE_PURESIZE (1290000 + SYSTEM_PURESIZE_EXTRA + 
SITELOAD_PURESIZE_EXTRA)
 #endif
 
 /* Increase BASE_PURESIZE by a ratio depending on the machine's word size.  */