summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2013-12-18 23:18:38 -0500
committerMatthias Clasen <mclasen@redhat.com>2013-12-18 23:21:42 -0500
commit9b23b563c3af31264db4aa70a54171b3ad890501 (patch)
treebdab6e00594d6115274538bda391cc87fd04d4a8
parentdeb78d971c4bcb9e3ccbb71e7925bc6baa707188 (diff)
downloadgdk-pixbuf-9b23b563c3af31264db4aa70a54171b3ad890501.tar.gz
Avoid some automake warnings
-rw-r--r--contrib/gdk-pixbuf-xlib/Makefile.am2
-rw-r--r--docs/reference/gdk-pixbuf/Makefile.am2
-rw-r--r--gdk-pixbuf/Makefile.am7
3 files changed, 6 insertions, 5 deletions
diff --git a/contrib/gdk-pixbuf-xlib/Makefile.am b/contrib/gdk-pixbuf-xlib/Makefile.am
index d6135559c..887379df0 100644
--- a/contrib/gdk-pixbuf-xlib/Makefile.am
+++ b/contrib/gdk-pixbuf-xlib/Makefile.am
@@ -6,7 +6,7 @@ endif
lib_LTLIBRARIES=libgdk_pixbuf_xlib-2.0.la
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) -I$(top_builddir) \
-I$(top_srcdir)/gdk-pixbuf \
-I$(top_srcdir)/contrib \
diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am
index c28e34f4c..1583a6f76 100644
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -34,7 +34,7 @@ IGNORE_HFILES= \
xpm-color-table.h \
test-images.h
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
$(GDK_PIXBUF_DEBUG_FLAGS) \
diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 8319b4910..b2bc1ff2f 100644
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -513,7 +513,7 @@ noinst_LTLIBRARIES = \
builtin_objs = @INCLUDED_LOADER_OBJ@ $(STATIC_PIXDATA_LIB)
DEPS = libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la
-INCLUDES = \
+AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"GdkPixbuf\" \
-DGDK_PIXBUF_COMPILATION \
-I$(top_srcdir) -I$(top_builddir) \
@@ -526,9 +526,10 @@ INCLUDES = \
$(INCLUDED_LOADER_DEFINE) \
$(GDK_PIXBUF_DEBUG_FLAGS) \
$(GDK_PIXBUF_DEP_CFLAGS) \
- -DGDK_PIXBUF_ENABLE_BACKEND
+ -DGDK_PIXBUF_ENABLE_BACKEND \
+ -DPIXBUF_LIBDIR=\"$(loaderdir)\" \
+ -DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"
-AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
LDADDS = libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
noinst_PROGRAMS = test-gdk-pixbuf