summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-07-29 06:24:44 -0700
committerStefano Karapetsas <[email protected]>2013-07-29 06:24:44 -0700
commit1147056ef7143075d9e3156dc6a4dae0e7e562ca (patch)
treed7403687bf22e1813f0c5b4f1183ade65bd0ce99
parent3c0e14e0a6b9768f2f5a8d6b6d97f927e6ff374d (diff)
parent52c9b0fb478ed76c6836a55bd1b7b6149daadf92 (diff)
downloadeom-1147056ef7143075d9e3156dc6a4dae0e7e562ca.tar.bz2
eom-1147056ef7143075d9e3156dc6a4dae0e7e562ca.tar.xz
Merge pull request #21 from NiceandGently/master
fix make files for automake-1.13
-rw-r--r--doc/reference/Makefile.am2
-rw-r--r--jpegutils/Makefile.am2
-rw-r--r--plugins/Makefile.am2
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index a796954..ec25e60 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -83,7 +83,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= \
+AM_CPPFLAGS= \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_srcdir)/src \
diff --git a/jpegutils/Makefile.am b/jpegutils/Makefile.am
index 26cd4d4..5af3710 100644
--- a/jpegutils/Makefile.am
+++ b/jpegutils/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = $(EOM_CFLAGS) \
+AM_CPPFLAGS = $(EOM_CFLAGS) \
$(EXIF_CFLAGS)
noinst_LTLIBRARIES = libeom-jpegutils.la
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 344bf15..02b74e6 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects
pluginsdir = $(libdir)/eom/plugins
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/src \
$(EOM_CFLAGS) \
$(WARN_CFLAGS) \