Commit 005bd5a2 authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

* 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.
parent 28fab7b5
2009-09-17 Dan Nicolaescu <dann@ics.uci.edu>
* configure.in (OTHER_FILES): Define using autoconf not cpp.
2009-09-14 Dan Nicolaescu <dann@ics.uci.edu>
* .dir-locals.el (change-log-mode): Restore bug-reference-mode.
......
......@@ -764,6 +764,7 @@ GNUSTEP_SYSTEM_HEADERS
GNUSTEP_SYSTEM_LIBRARIES
GNU_OBJC_CFLAGS
LIB_SRC_EXTRA_INSTALLABLES
OTHER_FILES
LTLIBOBJS'
ac_subst_files=''
ac_user_opts='
......@@ -15615,6 +15616,7 @@ _ACEOF
fi
# We also have mouse menus.
HAVE_MENUS=yes
OTHER_FILES=ns-app
fi
......
......@@ -2188,6 +2188,7 @@ if test "${HAVE_NS}" = "yes"; then
fi
# We also have mouse menus.
HAVE_MENUS=yes
OTHER_FILES=ns-app
fi
......@@ -2598,6 +2599,7 @@ AC_SUBST(GNUSTEP_SYSTEM_HEADERS)
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 @@ AH_BOTTOM([
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. */
......
2009-09-17 Dan Nicolaescu <dann@ics.uci.edu>
* 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 <monnier@iro.umontreal.ca>
* frame.c (x_get_resource_string): Remove unused.
......
......@@ -65,6 +65,8 @@ config_h = config.h $(M_FILE) $(S_FILE)
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 @@ LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS) $(DBUS_LIBS) \
@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 @@ ${libsrc}make-docfile${EXEEXT}:
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} \
-L@GNUSTEP_SYSTEM_LIBRARIES@ -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 @@ textprop.o: textprop.c buffer.h window.h dispextern.h $(INTERVALS_H) \
$(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
......
......@@ -1064,7 +1064,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
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. */
......
......@@ -41,7 +41,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#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. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment