*/Makefile.am: add LCMS_CFLAGS to CPPFLAGS

Since babl-space.h includes lcms2.h, we need to include LCMS_CFLAGS
everywhere that includes babl-internal.h.

diff --git a/babl/base/Makefile.am b/babl/base/Makefile.am
index 70a2f3022321f4c7b0f570dc2eb8b3a43437b8ba..119946233662d0d4d6e56155020a7303cee230d6 100644 (file)
--- a/babl/base/Makefile.am
+++ b/babl/base/Makefile.am
@@ -17,7 +17,7 @@ c_sources =                   \
        model-cmyk.c            \
        model-ycbcr.c
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl $(LCMS_CFLAGS)
 
 noinst_LTLIBRARIES= libbase.la
 libbase_la_SOURCES= $(h_sources) $(c_sources) 

diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index a066e8d1974c62a62e4a3262351e0863a5febce7..82ff6618bd3a677dc5158619e8c46ed6a7eae214 100644 (file)
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -11,7 +11,8 @@ AM_CPPFLAGS = \
        -I$(top_builddir)               \
        -I$(top_srcdir)                 \
        -I$(top_srcdir)/babl            \
-       -I$(top_srcdir)/extensions
+       -I$(top_srcdir)/extensions      \
+       $(LCMS_CFLAGS)
 
 extdir = $(libdir)/babl-@BABL_API_VERSION@
 ext_LTLIBRARIES = \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3f4af724986528189de6735973c0c2adefd24e6c..e48b1dd120a195d05a50ef7e52a1400f3c3fae41 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -34,7 +34,7 @@ TESTS = \
 
 TESTS_ENVIRONMENT = LD_LIBRARY_PATH=$(top_builddir)/babl:$LD_LIBRARY_PATH GI_TYPELIB_PATH=$(top_builddir)/babl BABL_PATH=$(top_builddir)/extensions/.libs
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl $(LCMS_CFLAGS)
 AM_LDFLAGS  = $(THREAD_LIB) -no-install
 
 LDADD = $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \

diff --git a/tools/Makefile.am b/tools/Makefile.am
index dcd549fecc64cb3beadbe44b08a9f939ade79891..00174f2a789b20733fe970f16de01e3ca8349d0f 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl $(LCMS_CFLAGS)
 AM_LDFLAGS = -no-install
 
 LDADD = $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \