diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-06-03 21:06:09 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2013-06-03 21:06:09 +0200 |
| commit | 7f203aa1fde2bc9ec43aa05a939525cdab149832 (patch) | |
| tree | 43e175dbe784faa04b4f3b284b1c62a89c26822a /src/Makefile.in | |
| parent | 55a87246bae97514b6e927b9401b2b79592b8b91 (diff) | |
| download | emacs-7f203aa1fde2bc9ec43aa05a939525cdab149832.tar.gz | |
* configure.ac (HAVE_GFILENOTIFY): Do not change $LIBS.
(GFILENOTIFY_CFLAGS, GFILENOTIFY_LIBS): Substitute.
* nt/config.nt: Add HAVE_GFILENOTIFY, HAVE_W32NOTIFY and USE_FILE_NOTIFY.
* src/Makefile.in (GFILENOTIFY_CFLAGS, GFILENOTIFY_LIBS): New variables.
(ALL_CFLAGS): Add $(GFILENOTIFY_CFLAGS).
(LIBES): Add $(GFILENOTIFY_LIBS).
* src/w32inevt.c (handle_file_notifications): Add dummy implementation
for !HAVE_W32NOTIFY.
* src/w32term.c: Wrap code with HAVE_W32NOTIFY.
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 0e42f0ee6a0..9d7857e4ca2 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -160,6 +160,8 @@ GTK_OBJ=@GTK_OBJ@ ## inotify.o if HAVE_INOTIFY. ## w32notify.o if HAVE_W32NOTIFY. NOTIFY_OBJ = @NOTIFY_OBJ@ +GFILENOTIFY_CFLAGS = @GFILENOTIFY_CFLAGS@ +GFILENOTIFY_LIBS = @GFILENOTIFY_LIBS@ ## -ltermcap, or -lncurses, or -lcurses, or "". LIBS_TERMCAP=@LIBS_TERMCAP@ @@ -345,7 +347,7 @@ ALL_CFLAGS=-Demacs $(MYCPPFLAGS) -I. -I$(srcdir) \ $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) $(XRANDR_CFLAGS) $(XINERAMA_CFLAGS) \ $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \ $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \ - $(LIBGNUTLS_CFLAGS) \ + $(LIBGNUTLS_CFLAGS) $(GFILENOTIFY_CFLAGS) \ $(WARN_CFLAGS) $(WERROR_CFLAGS) $(CFLAGS) ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS) @@ -427,7 +429,7 @@ LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \ $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \ $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \ $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(LIB_PTHREAD_SIGMASK) \ - $(LIB_MATH) + $(GFILENOTIFY_LIBS) $(LIB_MATH) all: emacs$(EXEEXT) $(OTHER_FILES) .PHONY: all |