dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build the color-managed CMYK color selector with the same filename as the 

2006-10-11  Sven Neumann  <sven@gimp.org>

	* modules/Makefile.am: build the color-managed CMYK color selector
	with the same filename as the naive implementation; they are
	mutually exclusive.
This commit is contained in:
Sven Neumann 2006-10-11 08:57:29 +00:00 committed by Sven Neumann
parent 5207040a0b
commit 09eb46429d
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-10-11 Sven Neumann <sven@gimp.org>
* modules/Makefile.am: build the color-managed CMYK color selector
with the same filename as the naive implementation; they are
mutually exclusive.
2006-10-11 Sven Neumann <sven@gimp.org>
* app/pdb/gimppdb.c: added missing casts.

15
modules/Makefile.am
View File

@ -21,11 +21,8 @@ EXTRA_DIST = \
makefile.msc
if HAVE_LCMS
colorsel_cmyk_module = libcolorsel_cmyk_lcms.la
cdisplay_lcms_module = libcdisplay_lcms.la
cdisplay_proof_module = libcdisplay_proof.la
else
colorsel_cmyk_module = libcolorsel_cmyk.la
endif
if HAVE_LINUX_INPUT
@ -33,7 +30,7 @@ controller_linux_input_module = libcontroller_linux_input.la
endif
lib_LTLIBRARIES = \
$(colorsel_cmyk_module) \
libcolorsel_cmyk.la \
libcolorsel_triangle.la \
libcolorsel_water.la \
libcdisplay_colorblind.la \
@ -51,13 +48,15 @@ colorsel_libadd = $(libgimpcolor) $(modules_libadd)
cdisplay_libadd = $(libgimpbase) $(libgimpconfig) $(modules_libadd)
controller_libadd = $(modules_libadd)
if HAVE_LCMS
libcolorsel_cmyk_la_SOURCES = colorsel_cmyk_lcms.c
libcolorsel_cmyk_la_LIBADD = $(libgimpconfig) $(colorsel_libadd) $(LCMS_LIBS)
else
libcolorsel_cmyk_la_SOURCES = colorsel_cmyk.c
libcolorsel_cmyk_la_LDFLAGS = -avoid-version -module $(no_undefined)
libcolorsel_cmyk_la_LIBADD = $(colorsel_libadd)
endif
libcolorsel_cmyk_lcms_la_SOURCES = colorsel_cmyk_lcms.c
libcolorsel_cmyk_lcms_la_LDFLAGS = -avoid-version -module $(no_undefined)
libcolorsel_cmyk_lcms_la_LIBADD = $(libgimpconfig) $(colorsel_libadd) $(LCMS_LIBS)
libcolorsel_cmyk_la_LDFLAGS = -avoid-version -module $(no_undefined)
libcolorsel_triangle_la_SOURCES = colorsel_triangle.c
libcolorsel_triangle_la_LDFLAGS = -avoid-version -module $(no_undefined)