comparison src/Makefile.in.in @ 177:6075d714658b r20-3b15

Import from CVS: tag r20-3b15
author cvs
date Mon, 13 Aug 2007 09:51:16 +0200
parents 2d532a89d707
children bfd6434d15b3
comparison
equal deleted inserted replaced
176:6866abce6aaf 177:6075d714658b
182 #ifdef REL_ALLOC 182 #ifdef REL_ALLOC
183 rallocdocsrc = ralloc.c 183 rallocdocsrc = ralloc.c
184 rallocobjs = ralloc.o 184 rallocobjs = ralloc.o
185 #endif 185 #endif
186 186
187 malloclib =
187 #ifndef SYSTEM_MALLOC 188 #ifndef SYSTEM_MALLOC
188 # ifdef GNU_MALLOC /* New GNU malloc */ 189 # ifdef GNU_MALLOC /* New GNU malloc */
189 # ifdef ERROR_CHECK_MALLOC 190 # ifdef ERROR_CHECK_MALLOC
190 mallocobjs = gmalloc.o free-hook.o vm-limit.o 191 mallocobjs = gmalloc.o free-hook.o vm-limit.o
191 mallocdocsrc = free-hook.c 192 mallocdocsrc = free-hook.c
198 mallocdocsrc = 199 mallocdocsrc =
199 # endif /* Old GNU malloc */ 200 # endif /* Old GNU malloc */
200 #else /* SYSTEM_MALLOC */ 201 #else /* SYSTEM_MALLOC */
201 mallocobjs = 202 mallocobjs =
202 mallocdocsrc = 203 mallocdocsrc =
204 #ifdef USE_DEBUG_MALLOC
205 malloclib = -ldmalloc
206 #endif /* USE_DEBUG_MALLOC */
203 #endif /* SYSTEM_MALLOC */ 207 #endif /* SYSTEM_MALLOC */
204 208
205 #ifdef HAVE_X_WINDOWS 209 #ifdef HAVE_X_WINDOWS
206 210
207 # ifdef EXTERNAL_WIDGET 211 # ifdef EXTERNAL_WIDGET
256 260
257 ## define otherobjs as list of object files that make-docfile 261 ## define otherobjs as list of object files that make-docfile
258 ## should not be told about. 262 ## should not be told about.
259 otherobjs = $(BTL_objs) lastfile.o $(mallocobjs) $(rallocobjs) $(X11_objs) 263 otherobjs = $(BTL_objs) lastfile.o $(mallocobjs) $(rallocobjs) $(X11_objs)
260 264
261 LIBES = $(lwlib_libs) $(quantify_libs) $(ld_libs_all) $(lib_gcc) 265 LIBES = $(lwlib_libs) $(quantify_libs) $(malloclib) $(ld_libs_all) $(lib_gcc)
262 266
263 #ifdef I18N3 267 #ifdef I18N3
264 mo_dir = ${etcdir} 268 mo_dir = ${etcdir}
265 mo_file = ${mo_dir}emacs.mo 269 mo_file = ${mo_dir}emacs.mo
266 #endif 270 #endif