[Xfce4-commits] <exo:master> Automake improvements.

[Nick Schermer]

Updating branch refs/heads/master
         to 3cb8c0807e7b568811715c0f6ea92d33e3561792 (commit)
       from 21bc67f4b37c914252684491ee191a41ea2d6113 (commit)

commit 3cb8c0807e7b568811715c0f6ea92d33e3561792
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Jan 6 11:50:51 2013 +0100

    Automake improvements.

 configure.ac.in                   |    4 ++--
 docs/reference/Makefile.am        |    2 +-
 exo-csource/Makefile.am           |    2 +-
 exo-desktop-item-edit/Makefile.am |    2 +-
 exo-helper/Makefile.am            |    2 +-
 exo-open/Makefile.am              |    2 +-
 exo/Makefile.am                   |    2 +-
 tests/Makefile.am                 |    2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index d2092e6..c4abf23 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -36,8 +36,8 @@ AC_CANONICAL_TARGET()
 dnl ***************************
 dnl *** Initialize automake ***
 dnl ***************************
-AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()])
-AM_CONFIG_HEADER([config.h])
+AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar no-dist-gzip])
+AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE()
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index d46b8d7..36fb8fa 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -48,7 +48,7 @@ content_files = 							\
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES =	 							\
+AM_CPPFLAGS =	 							\
 	-I$(top_srcdir) 						\
 	-I$(top_builddir) 						\
 	$(GTK_CFLAGS)							\
diff --git a/exo-csource/Makefile.am b/exo-csource/Makefile.am
index 0fb0526..1b65c49 100644
--- a/exo-csource/Makefile.am
+++ b/exo-csource/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = 								\
+AM_CPPFLAGS = 								\
 	-I$(top_srcdir)							\
 	-DG_LOG_DOMAIN=\"exo-csource\"					\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
diff --git a/exo-desktop-item-edit/Makefile.am b/exo-desktop-item-edit/Makefile.am
index bfc6c76..5c53ef5 100644
--- a/exo-desktop-item-edit/Makefile.am
+++ b/exo-desktop-item-edit/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = 								\
+AM_CPPFLAGS = 								\
 	-I$(top_builddir)						\
 	-I$(top_srcdir)							\
 	-DBINDIR=\"$(bindir)\"						\
diff --git a/exo-helper/Makefile.am b/exo-helper/Makefile.am
index 5eaff8c..0c932aa 100644
--- a/exo-helper/Makefile.am
+++ b/exo-helper/Makefile.am
@@ -2,7 +2,7 @@
 SUBDIRS =								\
 	helpers
 
-INCLUDES = 								\
+AM_CPPFLAGS = 								\
 	-I$(top_srcdir)							\
 	-DBINDIR=\"$(bindir)\"						\
 	-DDATADIR=\"$(datadir)\"					\
diff --git a/exo-open/Makefile.am b/exo-open/Makefile.am
index 2e9276b..2526b52 100644
--- a/exo-open/Makefile.am
+++ b/exo-open/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = 								\
+AM_CPPFLAGS = 								\
 	-I$(top_srcdir)							\
 	-DG_LOG_DOMAIN=\"exo-open\"					\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
diff --git a/exo/Makefile.am b/exo/Makefile.am
index cc700c2..7176722 100644
--- a/exo/Makefile.am
+++ b/exo/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = 								\
+AM_CPPFLAGS = 								\
 	-I$(top_srcdir)							\
 	-DDATADIR=\"$(datadir)\"					\
 	-DEXO_COMPILATION						\
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4af4858..8563418 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,7 +2,7 @@
 SUBDIRS =								\
 	data
 
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_srcdir)							\
 	-DG_LOG_DOMAIN=\"exo-tests\"