comparison src/Makefile.in.in @ 5178:97eb4942aec8

merge
author Ben Wing <ben@xemacs.org>
date Mon, 29 Mar 2010 21:28:13 -0500
parents b785049378e3 cf900a2f1fa3
children 308d34e9f07d
comparison
equal deleted inserted replaced
5177:b785049378e3 5178:97eb4942aec8
181 181
182 #ifdef HAVE_UNIXOID_EVENT_LOOP 182 #ifdef HAVE_UNIXOID_EVENT_LOOP
183 event_unixoid_objs=event-unixoid.o 183 event_unixoid_objs=event-unixoid.o
184 #endif 184 #endif
185 185
186 #ifdef HAVE_WINDOW_SYSTEM
187 glyphs_objs=glyphs-eimage.o glyphs-shared.o
188 #endif
189
186 #ifdef HAVE_GPM 190 #ifdef HAVE_GPM
187 gpm_objs=gpmevent.o 191 gpm_objs=gpmevent.o
188 #endif 192 #endif
189 193
190 #if defined(HAVE_LDAP) && !defined(HAVE_SHLIB) 194 #if defined(HAVE_LDAP) && !defined(HAVE_SHLIB)
268 272
269 ## NOTE: The last line cannot be all macros, because make will barf 273 ## NOTE: The last line cannot be all macros, because make will barf
270 ## if they all come out null. 274 ## if they all come out null.
271 275
272 objs=\ 276 objs=\
273 abbrev.o alloc.o alloca.o \ 277 abbrev.o alloc.o alloca.o array.o \
274 $(balloon_help_objs) blocktype.o buffer.o bytecode.o \ 278 $(balloon_help_objs) blocktype.o buffer.o bytecode.o \
275 callint.o casefiddle.o casetab.o chartab.o \ 279 callint.o casefiddle.o casetab.o chartab.o \
276 $(clash_detection_objs) cmdloop.o cmds.o $(coding_system_objs) console.o \ 280 $(clash_detection_objs) cmdloop.o cmds.o $(coding_system_objs) console.o \
277 console-stream.o\ 281 console-stream.o\
278 data.o $(database_objs) $(debug_objs) device.o dired.o doc.o doprnt.o\ 282 data.o $(database_objs) $(debug_objs) device.o dired.o doc.o doprnt.o\
279 dynarr.o \
280 editfns.o elhash.o emacs.o emodules.o eval.o events.o\ 283 editfns.o elhash.o emacs.o emodules.o eval.o events.o\
281 event-stream.o $(event_unixoid_objs) $(extra_objs) extents.o\ 284 event-stream.o $(event_unixoid_objs) $(extra_objs) extents.o\
282 faces.o file-coding.o fileio.o $(LOCK_OBJ) filemode.o floatfns.o fns.o \ 285 faces.o file-coding.o fileio.o $(LOCK_OBJ) filemode.o floatfns.o fns.o \
283 font-lock.o frame.o\ 286 font-lock.o frame.o\
284 gc.o general.o glyphs.o glyphs-eimage.o glyphs-shared.o\ 287 gc.o general.o glyphs.o $(glyphs_objs) glyphs-widget.o \
285 glyphs-widget.o $(gpm_objs) $(gtk_objs) $(gtk_gui_objs) $(gui_objs) \ 288 $(gpm_objs) $(gtk_objs) $(gtk_gui_objs) $(gui_objs) \
286 gutter.o\ 289 gutter.o\
287 hash.o imgproc.o indent.o insdel.o intl.o\ 290 hash.o imgproc.o indent.o insdel.o intl.o\
288 keymap.o $(RTC_patch_objs) line-number.o $(ldap_objs) lread.o lstream.o\ 291 keymap.o $(RTC_patch_objs) line-number.o $(ldap_objs) lread.o lstream.o\
289 $(new_gc_objs) $(vdb_objs) \ 292 $(new_gc_objs) $(vdb_objs) \
290 macros.o marker.o md5.o minibuf.o $(mswindows_objs) $(mswindows_gui_objs)\ 293 macros.o marker.o md5.o minibuf.o $(mswindows_objs) $(mswindows_gui_objs)\