diff options
| author | Eli Zaretskii | 2012-11-17 20:00:16 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-11-17 20:00:16 +0200 |
| commit | cf2d22b874ca2df0072e32ee641e8efffe4abd6d (patch) | |
| tree | 1795142ec7861fc85c61adc90f03265b69041556 /src/Makefile.in | |
| parent | 3c4ca7155293ffc2d04708007131bcbc882d8913 (diff) | |
| parent | 6ad30855c02908fdd99d9b11943719e185e65ee3 (diff) | |
| download | emacs-cf2d22b874ca2df0072e32ee641e8efffe4abd6d.tar.gz emacs-cf2d22b874ca2df0072e32ee641e8efffe4abd6d.zip | |
Merge from trunk.
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 9d8e9698ec8..330066d0103 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -150,6 +150,7 @@ M17N_FLT_CFLAGS = @M17N_FLT_CFLAGS@ | |||
| 150 | M17N_FLT_LIBS = @M17N_FLT_LIBS@ | 150 | M17N_FLT_LIBS = @M17N_FLT_LIBS@ |
| 151 | 151 | ||
| 152 | LIB_CLOCK_GETTIME=@LIB_CLOCK_GETTIME@ | 152 | LIB_CLOCK_GETTIME=@LIB_CLOCK_GETTIME@ |
| 153 | LIB_EACCESS=@LIB_EACCESS@ | ||
| 153 | LIB_TIMER_TIME=@LIB_TIMER_TIME@ | 154 | LIB_TIMER_TIME=@LIB_TIMER_TIME@ |
| 154 | 155 | ||
| 155 | DBUS_CFLAGS = @DBUS_CFLAGS@ | 156 | DBUS_CFLAGS = @DBUS_CFLAGS@ |
| @@ -392,7 +393,7 @@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(RALLOC_OBJ) \ | |||
| 392 | LIBES = $(LIBS) $(W32_LIBS) $(LIBX_BASE) $(LIBIMAGE) \ | 393 | LIBES = $(LIBS) $(W32_LIBS) $(LIBX_BASE) $(LIBIMAGE) \ |
| 393 | $(LIBX_OTHER) $(LIBSOUND) \ | 394 | $(LIBX_OTHER) $(LIBSOUND) \ |
| 394 | $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_CLOCK_GETTIME) \ | 395 | $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_CLOCK_GETTIME) \ |
| 395 | $(LIB_TIMER_TIME) $(DBUS_LIBS) \ | 396 | $(LIB_EACCESS) $(LIB_TIMER_TIME) $(DBUS_LIBS) \ |
| 396 | $(LIB_EXECINFO) \ | 397 | $(LIB_EXECINFO) \ |
| 397 | $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \ | 398 | $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \ |
| 398 | $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \ | 399 | $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \ |