From 09eb46429d270f75e77d5909c7b5b0f5116765f6 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Wed, 11 Oct 2006 08:57:29 +0000 Subject: [PATCH] build the color-managed CMYK color selector with the same filename as the 2006-10-11 Sven Neumann * modules/Makefile.am: build the color-managed CMYK color selector with the same filename as the naive implementation; they are mutually exclusive. --- ChangeLog | 6 ++++++ modules/Makefile.am | 15 +++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4adffb847c..08bf580074 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-10-11 Sven Neumann + + * 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 * app/pdb/gimppdb.c: added missing casts. diff --git a/modules/Makefile.am b/modules/Makefile.am index 4bcc75047a..4b4444748c 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -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)