diff options
| author | Michael Albinus | 2015-11-09 10:00:56 +0100 |
|---|---|---|
| committer | Michael Albinus | 2015-11-11 12:10:48 +0100 |
| commit | 662ee733257d573deaadd2e217894b70265fb5fe (patch) | |
| tree | 31a343154a51e310bee1ae3d840dd8aec13c4d3f /src/Makefile.in | |
| parent | ef75c3b56b8ff034eb47e0c69328227127cc93fa (diff) | |
| download | emacs-662ee733257d573deaadd2e217894b70265fb5fe.tar.gz emacs-662ee733257d573deaadd2e217894b70265fb5fe.zip | |
Add kqueue support
* configure.ac (--with-file-notification): Add kqueue.
(top): Remove special test for "${HAVE_NS}" and
${with_file_notification}, this is handled inside gfilenotify
tests. Add kqueue tests. Use NOTIFY_CFLAGS and NOTIFY_LIBS
instead of library specific variables.
* src/Makefile.in: Use NOTIFY_CFLAGS and NOTIFY_LIBS.
* src/emacs.c (main): Call globals_of_kqueue and syms_of_kqueue.
* src/kqueue.c: New file.
* src/lisp.h: Declare extern globals_of_kqueue and syms_of_kqueue.
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index f73575938d3..6a8571803f5 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -159,12 +159,13 @@ SETTINGS_LIBS = @SETTINGS_LIBS@ | |||
| 159 | ## gtkutil.o if USE_GTK, else empty. | 159 | ## gtkutil.o if USE_GTK, else empty. |
| 160 | GTK_OBJ=@GTK_OBJ@ | 160 | GTK_OBJ=@GTK_OBJ@ |
| 161 | 161 | ||
| 162 | ## gfilenotify.o if HAVE_GFILENOTIFY. | ||
| 163 | ## inotify.o if HAVE_INOTIFY. | 162 | ## inotify.o if HAVE_INOTIFY. |
| 163 | ## kqueue.o if HAVE_KQUEUE. | ||
| 164 | ## gfilenotify.o if HAVE_GFILENOTIFY. | ||
| 164 | ## w32notify.o if HAVE_W32NOTIFY. | 165 | ## w32notify.o if HAVE_W32NOTIFY. |
| 165 | NOTIFY_OBJ = @NOTIFY_OBJ@ | 166 | NOTIFY_OBJ = @NOTIFY_OBJ@ |
| 166 | GFILENOTIFY_CFLAGS = @GFILENOTIFY_CFLAGS@ | 167 | NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ |
| 167 | GFILENOTIFY_LIBS = @GFILENOTIFY_LIBS@ | 168 | NOTIFY_LIBS = @NOTIFY_LIBS@ |
| 168 | 169 | ||
| 169 | ## -ltermcap, or -lncurses, or -lcurses, or "". | 170 | ## -ltermcap, or -lncurses, or -lcurses, or "". |
| 170 | LIBS_TERMCAP=@LIBS_TERMCAP@ | 171 | LIBS_TERMCAP=@LIBS_TERMCAP@ |
| @@ -354,7 +355,7 @@ ALL_CFLAGS=-Demacs $(MYCPPFLAGS) -I. -I$(srcdir) \ | |||
| 354 | $(XRANDR_CFLAGS) $(XINERAMA_CFLAGS) $(XFIXES_CFLAGS) \ | 355 | $(XRANDR_CFLAGS) $(XINERAMA_CFLAGS) $(XFIXES_CFLAGS) \ |
| 355 | $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \ | 356 | $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \ |
| 356 | $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \ | 357 | $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \ |
| 357 | $(LIBGNUTLS_CFLAGS) $(GFILENOTIFY_CFLAGS) $(CAIRO_CFLAGS) \ | 358 | $(LIBGNUTLS_CFLAGS) $(NOTIFY_CFLAGS) $(CAIRO_CFLAGS) \ |
| 358 | $(WARN_CFLAGS) $(WERROR_CFLAGS) $(CFLAGS) | 359 | $(WARN_CFLAGS) $(WERROR_CFLAGS) $(CFLAGS) |
| 359 | ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS) | 360 | ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS) |
| 360 | 361 | ||
| @@ -467,7 +468,7 @@ LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \ | |||
| 467 | $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \ | 468 | $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \ |
| 468 | $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \ | 469 | $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \ |
| 469 | $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) \ | 470 | $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) \ |
| 470 | $(GFILENOTIFY_LIBS) $(LIB_MATH) $(LIBZ) | 471 | $(NOTIFY_LIBS) $(LIB_MATH) $(LIBZ) |
| 471 | 472 | ||
| 472 | $(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT) | 473 | $(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT) |
| 473 | $(MAKE) -C ../leim leim-list.el EMACS="$(bootstrap_exe)" | 474 | $(MAKE) -C ../leim leim-list.el EMACS="$(bootstrap_exe)" |