comparison src/Makefile.in.in @ 5091:ed624ab64583

fix compile errors/warnings -------------------- ChangeLog entries follow: -------------------- lib-src/ChangeLog addition: 2010-03-02 Ben Wing <ben@xemacs.org> * digest-doc.c: * make-path.c: `emacs' isn't defined, but HAVE_CONFIG_H is, so use it to get config.h. * getopt.h: Conditionalize on HAVE_CONFIG_H to get real prototypes. src/ChangeLog addition: 2010-03-02 Ben Wing <ben@xemacs.org> * Makefile.in.in: * Makefile.in.in (objs): glyphs-shared.o, glyphs-eimage.o only needed when HAVE_WINDOW_SYSTEM. glyphs-widget.o should be too, but we need a bit of work ifdeffing out the subwindow stuff from redisplay.c et al. * bytecode.c (init_opcode_table_multi_op): Change var name to avoid shadowing with `basename'. * emacs.c (main_1): Don't call init/etc. routines for glyphs-shared, glyphs-eimage unless HAVE_WINDOW_SYSTEM is defined. * linuxplay.c: * linuxplay.c (sighandler): * vdb-posix.c (vdb_fault_handler): Use const for variables holding string constants to avoid C++ warnings.
author Ben Wing <ben@xemacs.org>
date Tue, 02 Mar 2010 05:22:10 -0600
parents 14f0dd1fabdb
children cf900a2f1fa3
comparison
equal deleted inserted replaced
5083:88f955fa5a7f 5091:ed624ab64583
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)
279 dynarr.o \ 283 dynarr.o \
280 editfns.o elhash.o emacs.o emodules.o eval.o events.o\ 284 editfns.o elhash.o emacs.o emodules.o eval.o events.o\
281 event-stream.o $(event_unixoid_objs) $(extra_objs) extents.o\ 285 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 \ 286 faces.o file-coding.o fileio.o $(LOCK_OBJ) filemode.o floatfns.o fns.o \
283 font-lock.o frame.o\ 287 font-lock.o frame.o\
284 gc.o general.o glyphs.o glyphs-eimage.o glyphs-shared.o\ 288 gc.o general.o glyphs.o $(glyphs_objs) glyphs-widget.o \
285 glyphs-widget.o $(gpm_objs) $(gtk_objs) $(gtk_gui_objs) $(gui_objs) \ 289 $(gpm_objs) $(gtk_objs) $(gtk_gui_objs) $(gui_objs) \
286 gutter.o\ 290 gutter.o\
287 hash.o imgproc.o indent.o insdel.o intl.o\ 291 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\ 292 keymap.o $(RTC_patch_objs) line-number.o $(ldap_objs) lread.o lstream.o\
289 $(new_gc_objs) $(vdb_objs) \ 293 $(new_gc_objs) $(vdb_objs) \
290 macros.o marker.o md5.o minibuf.o $(mswindows_objs) $(mswindows_gui_objs)\ 294 macros.o marker.o md5.o minibuf.o $(mswindows_objs) $(mswindows_gui_objs)\