comparison src/Makefile.in @ 86940:2dd672d9fe75

* config.in (HAVE_DBUS): Add. * Makefile.in: (HAVE_DBUS): Add D-Bus definitions if defined. (ALL_CFLAGS): Add ${DBUS_CFLAGS}. (obj): Add $(DBUS_OBJ). (LIBES): Add $(DBUS_LIBS). (dbusbind.o): New target. * dbusbind.c: New file. * emacs.c (main): Call syms_of_dbusbind when HAVE_DBUS is defined. * keyboard.c: All D-Bus related code is wrapped by "#ifdef HAVE_DBUS". (Qdbus_event) New Lisp symbol. (kbd_buffer_get_event, make_lispy_event): Handle DBUS_EVENT. (gobble_input): Call xd_read_queued_messages, reading D-Bus messages. (keys_of_keyboard ): Define dbus-event. * termhooks.h (event_kind): Add DBUS_EVENT when HAVE_DBUS is defined.
author Michael Albinus <michael.albinus@gmx.de>
date Sun, 02 Dec 2007 16:23:40 +0000
parents 2c08ad76fc1f
children 107ccd98fa12 53108e6cea98
comparison
equal deleted inserted replaced
86939:3adb90e40145 86940:2dd672d9fe75
260 #ifndef USE_GTK 260 #ifndef USE_GTK
261 TOOLKIT_DEFINES = 261 TOOLKIT_DEFINES =
262 #endif 262 #endif
263 #endif 263 #endif
264 264
265 #ifdef HAVE_DBUS
266 DBUS_CFLAGS = @DBUS_CFLAGS@
267 DBUS_LIBS = @DBUS_LIBS@
268 DBUS_OBJ = dbusbind.o
269 #endif
270
265 /* DO NOT use -R. There is a special hack described in lastfile.c 271 /* DO NOT use -R. There is a special hack described in lastfile.c
266 which is used instead. Some initialized data areas are modified 272 which is used instead. Some initialized data areas are modified
267 at initial startup, then labeled as part of the text area when 273 at initial startup, then labeled as part of the text area when
268 Emacs is dumped for the first time, and never changed again. */ 274 Emacs is dumped for the first time, and never changed again. */
269 275
273 -DHAVE_CONFIG_H is needed for some other files to take advantage of 279 -DHAVE_CONFIG_H is needed for some other files to take advantage of
274 the information in ``config.h''. */ 280 the information in ``config.h''. */
275 281
276 /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM 282 /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM
277 since it may have -I options that should override those two. */ 283 since it may have -I options that should override those two. */
278 ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${CFLAGS} 284 ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${CFLAGS}
279 .c.o: 285 .c.o:
280 $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< 286 $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
281 287
282 #ifndef LIBX11_MACHINE 288 #ifndef LIBX11_MACHINE
283 #define LIBX11_MACHINE 289 #define LIBX11_MACHINE
586 592
587 /* lastfile must follow all files 593 /* lastfile must follow all files
588 whose initialized data areas should be dumped as pure by dump-emacs. */ 594 whose initialized data areas should be dumped as pure by dump-emacs. */
589 obj= dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \ 595 obj= dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \
590 charset.o coding.o category.o ccl.o \ 596 charset.o coding.o category.o ccl.o \
591 cm.o term.o terminal.o xfaces.o $(XOBJ) $(GTK_OBJ)\ 597 cm.o term.o terminal.o xfaces.o $(XOBJ) $(GTK_OBJ) $(DBUS_OBJ) \
592 emacs.o keyboard.o macros.o keymap.o sysdep.o \ 598 emacs.o keyboard.o macros.o keymap.o sysdep.o \
593 buffer.o filelock.o insdel.o marker.o \ 599 buffer.o filelock.o insdel.o marker.o \
594 minibuf.o fileio.o dired.o filemode.o \ 600 minibuf.o fileio.o dired.o filemode.o \
595 cmds.o casetab.o casefiddle.o indent.o search.o regex.o undo.o \ 601 cmds.o casetab.o casefiddle.o indent.o search.o regex.o undo.o \
596 alloc.o data.o doc.o editfns.o callint.o \ 602 alloc.o data.o doc.o editfns.o callint.o \
936 942
937 /* Construct full set of libraries to be linked. 943 /* Construct full set of libraries to be linked.
938 Note that SunOS needs -lm to come before -lc; otherwise, you get 944 Note that SunOS needs -lm to come before -lc; otherwise, you get
939 duplicated symbols. If the standard libraries were compiled 945 duplicated symbols. If the standard libraries were compiled
940 with GCC, we might need gnulib again after them. */ 946 with GCC, we might need gnulib again after them. */
941 LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS) LIBGPM \ 947 LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS) $(DBUS_LIBS) \
942 LIBRESOLV LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \ 948 LIBGPM LIBRESOLV LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \
943 LIBS_DEBUG $(GETLOADAVG_LIBS) $(GNULIB_VAR) LIB_MATH LIB_STANDARD \ 949 LIBS_DEBUG $(GETLOADAVG_LIBS) $(GNULIB_VAR) LIB_MATH LIB_STANDARD \
944 $(GNULIB_VAR) 950 $(GNULIB_VAR)
945 951
946 /* Enable recompilation of certain other files depending on system type. */ 952 /* Enable recompilation of certain other files depending on system type. */
947 953
1226 xselect.o: xselect.c process.h dispextern.h frame.h xterm.h blockinput.h \ 1232 xselect.o: xselect.c process.h dispextern.h frame.h xterm.h blockinput.h \
1227 buffer.h atimer.h systime.h termhooks.h $(config_h) 1233 buffer.h atimer.h systime.h termhooks.h $(config_h)
1228 xrdb.o: xrdb.c $(config_h) epaths.h 1234 xrdb.o: xrdb.c $(config_h) epaths.h
1229 xsmfns.o: xsmfns.c $(config_h) systime.h sysselect.h termhooks.h xterm.h \ 1235 xsmfns.o: xsmfns.c $(config_h) systime.h sysselect.h termhooks.h xterm.h \
1230 lisp.h termopts.h 1236 lisp.h termopts.h
1231 gtkutil.o: gtkutil.c gtkutil.h xterm.h lisp.h frame.h $(config_h) \ 1237 gtkutil.o: gtkutil.c gtkutil.h xterm.h lisp.h frame.h $(config_h) \
1232 blockinput.h window.h atimer.h systime.h termhooks.h keyboard.h \ 1238 blockinput.h window.h atimer.h systime.h termhooks.h keyboard.h \
1233 charset.h coding.h 1239 charset.h coding.h
1240 dbusbind.o: dbusbind.c termhooks.h $(config_h)
1234 1241
1235 hftctl.o: hftctl.c $(config_h) 1242 hftctl.o: hftctl.c $(config_h)
1236 sound.o: sound.c dispextern.h $(config_h) 1243 sound.o: sound.c dispextern.h $(config_h)
1237 atimer.o: atimer.c atimer.h systime.h $(config_h) 1244 atimer.o: atimer.c atimer.h systime.h $(config_h)
1238 1245