aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--libsylph/Makefile.am2
-rw-r--r--plugin/attachment_tool/Makefile.am3
-rw-r--r--plugin/test/Makefile.am3
-rw-r--r--src/Makefile.am3
5 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 17cc4869..d5c384c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-10-10
+
+ * libsylph/Makefile.am
+ src/Makefile.am
+ plugin/test/Makefile.am
+ plugin/attachment_tool/Makefile.am: removed includedir from include
+ path in Makefiles (thanks to Valentine Barshak).
+
2012-10-05
* configure.in: raised the required GTK+ version to 2.8.0.
diff --git a/libsylph/Makefile.am b/libsylph/Makefile.am
index fa6a436f..b512d120 100644
--- a/libsylph/Makefile.am
+++ b/libsylph/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DLOCALEDIR=\""$(localedir)"\"
-INCLUDES = -I$(top_srcdir) $(GLIB_CFLAGS) -I$(includedir)
+INCLUDES = -I$(top_srcdir) $(GLIB_CFLAGS)
lib_LTLIBRARIES = libsylph-0.la
#noinst_LTLIBRARIES = libsylph.la
diff --git a/plugin/attachment_tool/Makefile.am b/plugin/attachment_tool/Makefile.am
index ae1006a6..81079b68 100644
--- a/plugin/attachment_tool/Makefile.am
+++ b/plugin/attachment_tool/Makefile.am
@@ -9,8 +9,7 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/libsylph \
-I$(top_srcdir)/src \
- $(GTK_CFLAGS) \
- -I$(includedir)
+ $(GTK_CFLAGS)
attachment_tool_la_LIBADD = \
$(GTK_LIBS) \
diff --git a/plugin/test/Makefile.am b/plugin/test/Makefile.am
index 89cbba5d..dabf7980 100644
--- a/plugin/test/Makefile.am
+++ b/plugin/test/Makefile.am
@@ -9,8 +9,7 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/libsylph \
-I$(top_srcdir)/src \
- $(GTK_CFLAGS) \
- -I$(includedir)
+ $(GTK_CFLAGS)
test_la_LIBADD = \
$(GTK_LIBS) \
diff --git a/src/Makefile.am b/src/Makefile.am
index e34a2ee9..cc0feb3c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -140,8 +140,7 @@ INCLUDES = \
-I$(top_srcdir)/libsylph \
$(GTK_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
- $(GPGME_CFLAGS) \
- -I$(includedir)
+ $(GPGME_CFLAGS)
if NATIVE_WIN32
SYLPHEED_RES = sylpheed.res