aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile.in
diff options
context:
space:
mode:
authorMark Oteiza2017-09-13 10:27:37 -0400
committerMark Oteiza2017-09-13 10:27:37 -0400
commit5d4c539bd7e15e7fd0fb092276791b6287260a9a (patch)
treecc46c19ff16d9f12a6f6f8c2e2f5ba5807654c31 /src/Makefile.in
parent9a8bbb9d5d3a55d4a31658e188f305669bd26e79 (diff)
downloademacs-5d4c539bd7e15e7fd0fb092276791b6287260a9a.tar.gz
emacs-5d4c539bd7e15e7fd0fb092276791b6287260a9a.zip
Add lcms2 interface
configure.ac: Add boilerplate for configuring and detecting liblcms2. etc/NEWS: Mention new configure option and color-distance change. src/Makefile.in: Add references to lcms.c and liblcms. src/emacs.c: Define lcms2 symbols. src/lcms.c: New file. src/lisp.h: Add declaration for lcms2. src/xfaces.c: Add optional METRIC argument.
Diffstat (limited to 'src/Makefile.in')
-rw-r--r--src/Makefile.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index dde3f1d3fb4..a98ad9c5ebd 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -234,6 +234,8 @@ LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
234 234
235GETADDRINFO_A_LIBS = @GETADDRINFO_A_LIBS@ 235GETADDRINFO_A_LIBS = @GETADDRINFO_A_LIBS@
236 236
237LIBLCMS2 = @LIBLCMS2@
238
237LIBZ = @LIBZ@ 239LIBZ = @LIBZ@
238 240
239## system-specific libs for dynamic modules, else empty 241## system-specific libs for dynamic modules, else empty
@@ -389,7 +391,7 @@ base_obj = dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \
389 syntax.o $(UNEXEC_OBJ) bytecode.o \ 391 syntax.o $(UNEXEC_OBJ) bytecode.o \
390 process.o gnutls.o callproc.o \ 392 process.o gnutls.o callproc.o \
391 region-cache.o sound.o atimer.o \ 393 region-cache.o sound.o atimer.o \
392 doprnt.o intervals.o textprop.o composite.o xml.o $(NOTIFY_OBJ) \ 394 doprnt.o intervals.o textprop.o composite.o xml.o lcms.o $(NOTIFY_OBJ) \
393 $(XWIDGETS_OBJ) \ 395 $(XWIDGETS_OBJ) \
394 profiler.o decompress.o \ 396 profiler.o decompress.o \
395 thread.o systhread.o \ 397 thread.o systhread.o \
@@ -490,7 +492,7 @@ LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \
490 $(LIBXML2_LIBS) $(LIBGPM) $(LIBS_SYSTEM) $(CAIRO_LIBS) \ 492 $(LIBXML2_LIBS) $(LIBGPM) $(LIBS_SYSTEM) $(CAIRO_LIBS) \
491 $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \ 493 $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \
492 $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \ 494 $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \
493 $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(GETADDRINFO_A_LIBS) \ 495 $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(GETADDRINFO_A_LIBS) $(LIBLCMS2) \
494 $(NOTIFY_LIBS) $(LIB_MATH) $(LIBZ) $(LIBMODULES) $(LIBSYSTEMD_LIBS) 496 $(NOTIFY_LIBS) $(LIB_MATH) $(LIBZ) $(LIBMODULES) $(LIBSYSTEMD_LIBS)
495 497
496## FORCE it so that admin/unidata can decide whether these files 498## FORCE it so that admin/unidata can decide whether these files