[babl] */Makefile.am: add LCMS_CFLAGS to CPPFLAGS
- From: Ell <ell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [babl] */Makefile.am: add LCMS_CFLAGS to CPPFLAGS
- Date: Wed, 28 Nov 2018 10:06:52 +0000 (UTC)
commit f6e9ac8f814729cec248048aff68abcbbc6c1184
Author: Ell <ell_se yahoo com>
Date: Wed Nov 28 05:04:31 2018 -0500
*/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.
babl/base/Makefile.am | 2 +-
extensions/Makefile.am | 3 ++-
tests/Makefile.am | 2 +-
tools/Makefile.am | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/babl/base/Makefile.am b/babl/base/Makefile.am
index 70a2f30..1199462 100644
--- 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 a066e8d..82ff661 100644
--- 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 3f4af72..e48b1dd 100644
--- 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 dcd549f..00174f2 100644
--- 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 \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]