diff options
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 65927ba236c..0e7ff9cbd33 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | # script may need modifying in sync with changes made here. Try to | 23 | # script may need modifying in sync with changes made here. Try to |
| 24 | # avoid shell-ism because the DOS build has to use the DOS shell. | 24 | # avoid shell-ism because the DOS build has to use the DOS shell. |
| 25 | 25 | ||
| 26 | SHELL = /bin/sh | 26 | SHELL = @SHELL@ |
| 27 | 27 | ||
| 28 | # Here are the things that we expect ../configure to edit. | 28 | # Here are the things that we expect ../configure to edit. |
| 29 | # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH. | 29 | # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH. |
| @@ -243,6 +243,8 @@ IMAGEMAGICK_CFLAGS= @IMAGEMAGICK_CFLAGS@ | |||
| 243 | LIBXML2_LIBS = @LIBXML2_LIBS@ | 243 | LIBXML2_LIBS = @LIBXML2_LIBS@ |
| 244 | LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ | 244 | LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ |
| 245 | 245 | ||
| 246 | LIBZ = @LIBZ@ | ||
| 247 | |||
| 246 | XRANDR_LIBS = @XRANDR_LIBS@ | 248 | XRANDR_LIBS = @XRANDR_LIBS@ |
| 247 | XRANDR_CFLAGS = @XRANDR_CFLAGS@ | 249 | XRANDR_CFLAGS = @XRANDR_CFLAGS@ |
| 248 | 250 | ||
| @@ -374,7 +376,7 @@ base_obj = dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ | |||
| 374 | process.o gnutls.o callproc.o \ | 376 | process.o gnutls.o callproc.o \ |
| 375 | region-cache.o sound.o atimer.o \ | 377 | region-cache.o sound.o atimer.o \ |
| 376 | doprnt.o intervals.o textprop.o composite.o xml.o $(NOTIFY_OBJ) \ | 378 | doprnt.o intervals.o textprop.o composite.o xml.o $(NOTIFY_OBJ) \ |
| 377 | profiler.o \ | 379 | profiler.o decompress.o \ |
| 378 | $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \ | 380 | $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \ |
| 379 | $(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ) | 381 | $(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ) |
| 380 | obj = $(base_obj) $(NS_OBJC_OBJ) | 382 | obj = $(base_obj) $(NS_OBJC_OBJ) |
| @@ -429,7 +431,7 @@ LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \ | |||
| 429 | $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \ | 431 | $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \ |
| 430 | $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \ | 432 | $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \ |
| 431 | $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(LIB_PTHREAD_SIGMASK) \ | 433 | $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(LIB_PTHREAD_SIGMASK) \ |
| 432 | $(GFILENOTIFY_LIBS) $(LIB_MATH) | 434 | $(GFILENOTIFY_LIBS) $(LIB_MATH) $(LIBZ) |
| 433 | 435 | ||
| 434 | all: emacs$(EXEEXT) $(OTHER_FILES) | 436 | all: emacs$(EXEEXT) $(OTHER_FILES) |
| 435 | .PHONY: all | 437 | .PHONY: all |