Attachment 100105 Details for Bug 79411 – Replace use of INCLUDES with AM_CPPFLAGS in every Makefile.am

[patch] Replace use of INCLUDES with AM_CPPFLAGS in every Makefile.am

Replace-use-of-INCLUDES-with-AMCPPFLAGS-in-every-M.patch (text/plain), 6.23 KB, created by Hib Eris on 2014-05-29 12:21:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hib Eris

Created: 2014-05-29 12:21:53 UTC

Size: 6.23 KB

patch

obsolete

>From 0c0fd0058718e0a0ce2884850050358a2fb87985 Mon Sep 17 00:00:00 2001
>From: Hib Eris <hib@hiberis.nl>
>Date: Thu, 29 May 2014 14:17:35 +0200
>Subject: [PATCH] Replace use of INCLUDES with AM_CPPFLAGS in every Makefile.am
>
>The use of INCLUDES is deprecated. Poppler requires at least
>automake version 1.7 which support AM_CPPFLAGS.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=79411
>---
> cpp/Makefile.am            | 2 +-
> cpp/tests/Makefile.am      | 2 +-
> fofi/Makefile.am           | 2 +-
> glib/Makefile.am           | 2 +-
> glib/demo/Makefile.am      | 2 +-
> glib/reference/Makefile.am | 2 +-
> goo/Makefile.am            | 2 +-
> poppler/Makefile.am        | 2 +-
> qt4/demos/Makefile.am      | 2 +-
> qt4/src/Makefile.am        | 2 +-
> qt4/tests/Makefile.am      | 2 +-
> qt5/demos/Makefile.am      | 2 +-
> qt5/src/Makefile.am        | 2 +-
> qt5/tests/Makefile.am      | 2 +-
> splash/Makefile.am         | 2 +-
> test/Makefile.am           | 2 +-
> utils/Makefile.am          | 2 +-
> 17 files changed, 17 insertions(+), 17 deletions(-)
>
>diff --git a/cpp/Makefile.am b/cpp/Makefile.am
>index 50856e2..cc1fe96 100644
>--- a/cpp/Makefile.am
>+++ b/cpp/Makefile.am
>@@ -1,4 +1,4 @@
>-INCLUDES =					\
>+AM_CPPFLAGS =					\
> 	-I$(top_srcdir)				\
> 	-I$(top_srcdir)/goo			\
> 	-I$(top_srcdir)/poppler			\
>diff --git a/cpp/tests/Makefile.am b/cpp/tests/Makefile.am
>index aab55f2..2bc25b8 100644
>--- a/cpp/tests/Makefile.am
>+++ b/cpp/tests/Makefile.am
>@@ -1,6 +1,6 @@
> AM_LDFLAGS = @auto_import_flags@
> 
>-INCLUDES =					\
>+AM_CPPFLAGS =					\
> 	-I$(top_srcdir)				\
> 	-I$(top_srcdir)/utils			\
> 	-I$(top_srcdir)/cpp
>diff --git a/fofi/Makefile.am b/fofi/Makefile.am
>index c4654dd..c4c2084 100644
>--- a/fofi/Makefile.am
>+++ b/fofi/Makefile.am
>@@ -1,4 +1,4 @@
>-INCLUDES =					\
>+AM_CPPFLAGS =					\
> 	-I$(top_srcdir)
> 
> noinst_LTLIBRARIES = libfofi.la
>diff --git a/glib/Makefile.am b/glib/Makefile.am
>index 040996a..0862faf 100644
>--- a/glib/Makefile.am
>+++ b/glib/Makefile.am
>@@ -1,7 +1,7 @@
> AM_LDFLAGS = @auto_import_flags@
> 
> SUBDIRS = . reference demo
>-INCLUDES =					\
>+AM_CPPFLAGS =					\
> 	-DG_LOG_DOMAIN=\"Poppler\"		\
> 	-I$(top_srcdir)				\
> 	-I$(top_srcdir)/poppler			\
>diff --git a/glib/demo/Makefile.am b/glib/demo/Makefile.am
>index e5df9d0..0ebfa99 100644
>--- a/glib/demo/Makefile.am
>+++ b/glib/demo/Makefile.am
>@@ -1,4 +1,4 @@
>-INCLUDES = 					\
>+AM_CPPFLAGS =					\
> 	-I$(top_srcdir)/glib			\
> 	-I$(top_builddir)/glib			\
> 	$(GTK_TEST_CFLAGS)			\
>diff --git a/glib/reference/Makefile.am b/glib/reference/Makefile.am
>index b01192d..338c794 100644
>--- a/glib/reference/Makefile.am
>+++ b/glib/reference/Makefile.am
>@@ -67,7 +67,7 @@ expand_content_files=
> # signals and properties.
> # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
> # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
>-INCLUDES=-I$(top_srcdir)/glib -I$(top_builddir)/glib	\
>+AM_CPPFLAGS=-I$(top_srcdir)/glib -I$(top_builddir)/glib	\
> 	$(CAIRO_CFLAGS)					\
> 	$(POPPLER_GLIB_CFLAGS)				\
> 	$(FREETYPE_CFLAGS)
>diff --git a/goo/Makefile.am b/goo/Makefile.am
>index a48b20e..bf9d24e 100644
>--- a/goo/Makefile.am
>+++ b/goo/Makefile.am
>@@ -40,7 +40,7 @@ if BUILD_LIBPNG
> libpng_includes = $(LIBPNG_CFLAGS)
> endif
> 
>-INCLUDES =					\
>+AM_CPPFLAGS =					\
> 	-I$(top_srcdir)				\
> 	$(libjpeg_includes)                     \
> 	$(libtiff_includes)                     \
>diff --git a/poppler/Makefile.am b/poppler/Makefile.am
>index ce6f4b2..9351d76 100644
>--- a/poppler/Makefile.am
>+++ b/poppler/Makefile.am
>@@ -120,7 +120,7 @@ cms_includes = $(LCMS_CFLAGS)
> cms_libs = $(LCMS_LIBS)
> endif
> 
>-INCLUDES =					\
>+AM_CPPFLAGS =					\
> 	-I$(top_srcdir)				\
> 	-I$(top_srcdir)/goo			\
> 	$(cms_includes)				\
>diff --git a/qt4/demos/Makefile.am b/qt4/demos/Makefile.am
>index 3cadda9..2e8b6da 100644
>--- a/qt4/demos/Makefile.am
>+++ b/qt4/demos/Makefile.am
>@@ -1,6 +1,6 @@
> AM_LDFLAGS = @auto_import_flags@
> 
>-INCLUDES =					\
>+AM_CPPFLAGS =					\
> 	-I$(top_srcdir)				\
> 	-I$(top_srcdir)/poppler			\
> 	-I$(top_srcdir)/qt4/src			\
>diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am
>index 83a3b98..e1d3bcb 100644
>--- a/qt4/src/Makefile.am
>+++ b/qt4/src/Makefile.am
>@@ -1,4 +1,4 @@
>-INCLUDES =					\
>+AM_CPPFLAGS =					\
> 	-I$(top_srcdir)				\
> 	-I$(top_srcdir)/poppler			\
> 	$(POPPLER_QT4_CFLAGS)			\
>diff --git a/qt4/tests/Makefile.am b/qt4/tests/Makefile.am
>index 4e4b210..aa62186 100644
>--- a/qt4/tests/Makefile.am
>+++ b/qt4/tests/Makefile.am
>@@ -1,6 +1,6 @@
> AM_LDFLAGS = @auto_import_flags@
> 
>-INCLUDES =					\
>+AM_CPPFLAGS =					\
> 	-I$(top_srcdir)				\
> 	-I$(top_srcdir)/poppler			\
> 	-I$(top_srcdir)/qt4/src			\
>diff --git a/qt5/demos/Makefile.am b/qt5/demos/Makefile.am
>index 15942f2..b73f2bf 100644
>--- a/qt5/demos/Makefile.am
>+++ b/qt5/demos/Makefile.am
>@@ -1,6 +1,6 @@
> AM_LDFLAGS = @auto_import_flags@
> 
>-INCLUDES =					\
>+AM_CPPFLAGS =					\
> 	-I$(top_srcdir)				\
> 	-I$(top_srcdir)/poppler			\
> 	-I$(top_srcdir)/qt5/src			\
>diff --git a/qt5/src/Makefile.am b/qt5/src/Makefile.am
>index 81dba68..af53935 100644
>--- a/qt5/src/Makefile.am
>+++ b/qt5/src/Makefile.am
>@@ -1,4 +1,4 @@
>-INCLUDES =					\
>+AM_CPPFLAGS =					\
> 	-I$(top_srcdir)				\
> 	-I$(top_srcdir)/poppler			\
> 	$(POPPLER_QT5_CFLAGS)			\
>diff --git a/qt5/tests/Makefile.am b/qt5/tests/Makefile.am
>index b3eecef..b75292c 100644
>--- a/qt5/tests/Makefile.am
>+++ b/qt5/tests/Makefile.am
>@@ -1,6 +1,6 @@
> AM_LDFLAGS = @auto_import_flags@
> 
>-INCLUDES =					\
>+AM_CPPFLAGS =					\
> 	-I$(top_srcdir)				\
> 	-I$(top_srcdir)/poppler			\
> 	-I$(top_srcdir)/qt5/src			\
>diff --git a/splash/Makefile.am b/splash/Makefile.am
>index 4330c53..b90c50c 100644
>--- a/splash/Makefile.am
>+++ b/splash/Makefile.am
>@@ -1,4 +1,4 @@
>-INCLUDES =					\
>+AM_CPPFLAGS =					\
> 	-I$(top_srcdir)				\
> 	-I$(top_srcdir)/goo			\
> 	$(libjpeg_includes)			\
>diff --git a/test/Makefile.am b/test/Makefile.am
>index af5bcf2..0de9dab 100644
>--- a/test/Makefile.am
>+++ b/test/Makefile.am
>@@ -33,7 +33,7 @@ endif
> pdf_fullrewrite = \
> 	pdf-fullrewrite
> 
>-INCLUDES =					\
>+AM_CPPFLAGS =					\
> 	-I$(top_srcdir)				\
> 	-I$(top_srcdir)/poppler			\
> 	-I$(top_srcdir)/glib			\
>diff --git a/utils/Makefile.am b/utils/Makefile.am
>index 1dd9a12..236d824 100644
>--- a/utils/Makefile.am
>+++ b/utils/Makefile.am
>@@ -10,7 +10,7 @@ pdftoppm_manpage = pdftoppm.1
> 
> endif
> 
>-INCLUDES =					\
>+AM_CPPFLAGS =					\
> 	-I$(top_srcdir)				\
> 	-I$(top_srcdir)/goo			\
> 	-I$(top_srcdir)/utils			\
>-- 
>1.8.3.2

Actions: View | Splinter Review

Attachments on bug 79411: 100105 | 100538 | 100539 | 100540 | 100541 | 100542 | 100543 | 100544 | 100545 | 100546 | 100547 | 100548 | 100549 | 100550 | 100551 | 100552 | 100553 | 100554 | 100555 | 100556 | 100557 | 100558 | 103283

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.