Fix deprecated INCLUDES

diff --git a/dbus-client/Makefile.am b/dbus-client/Makefile.am
index f22eaec36d2b4dcd1eda38674fb5ea2bde7a9d98..d27f951148132f4c4391fa4356efe1f608eea6d3 100644 (file)
--- a/dbus-client/Makefile.am
+++ b/dbus-client/Makefile.am
@@ -2,19 +2,17 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-INCLUDES = \
+AM_CPPFLAGS = \
           -I${top_srcdir} \
           -I${top_builddir} \
           -I${top_srcdir}/src \
           -I${top_srcdir}/src/dbus \
           @GLIB_CFLAGS@ \
-          @GTK_CFLAGS@
+          @GTK_CFLAGS@ \
+          -DG_LOG_DOMAIN=\"Claws-Contacts\"
 
 bin_PROGRAMS = dbus-client
 
-AM_CPPFLAGS = \
-               -DG_LOG_DOMAIN=\"Claws-Contacts\"
-
 dbus_client_SOURCES = \
                     client.c
 

diff --git a/extensions/example/src/Makefile.am b/extensions/example/src/Makefile.am
index 24716bc1e75919339305690c226f952b68234ec7..44ebbc34643a222791e30d22a5362dd0af68b862 100644 (file)
--- a/extensions/example/src/Makefile.am
+++ b/extensions/example/src/Makefile.am
@@ -8,19 +8,18 @@ extension_LTLIBRARIES = example-extension.la
 example_extension_la_LDFLAGS = \
        -avoid-version -module
 
-INCLUDES = \
+AM_CPPFLAGS = \
           -I${top_srcdir} \
           -I${top_srcdir}/src \
           -I${top_builddir} \
           @GLIB_CFLAGS@ \
-          @GTK_CFLAGS@
+          @GTK_CFLAGS@ \
+          $(CLAWS_CONTACTS_CFLAGS) \
+          -DG_LOG_DOMAIN=\"Claws-Contacts\"
 
 
 example_extensionincludedir= \
                $(includedir)/claws-contacts/extensions/@PACKAGE@
-AM_CPPFLAGS = \
-               $(CLAWS_CONTACTS_CFLAGS) \
-               -DG_LOG_DOMAIN=\"Claws-Contacts\"
 
 example_extension_la_SOURCES = \
                    example-extension.c

diff --git a/extensions/export/Makefile.am b/extensions/export/Makefile.am
index 1eec9b4634f537c26fb34fd883d2a31308d1af0f..e3d5741b9ad1b6f3a91cb878e90086df9446ec84 100644 (file)
--- a/extensions/export/Makefile.am
+++ b/extensions/export/Makefile.am
@@ -8,16 +8,14 @@ extension_LTLIBRARIES = ldifexport-extension.la
 ldifexport_extension_la_LDFLAGS = \
        -avoid-version -module
 
-INCLUDES = \
+AM_CPPFLAGS = \
           -I${top_srcdir} \
           -I${top_srcdir}/src \
           -I$(top_srcdir)/src/dbus \
           -I${top_builddir} \
           @GLIB_CFLAGS@ \
-          @GTK_CFLAGS@
-
-AM_CPPFLAGS = \
-               -DG_LOG_DOMAIN=\"Claws-Contacts\"
+          @GTK_CFLAGS@ \
+          -DG_LOG_DOMAIN=\"Claws-Contacts\"
 
 ldifexport_extension_la_SOURCES = \
                    ldifexport_extension.c \

diff --git a/extensions/import/Makefile.am b/extensions/import/Makefile.am
index f7e659fc0a61b15273bd54c412815b8565c625e3..92351bec4c9690d363fb537b2b1586c01cbd3305 100644 (file)
--- a/extensions/import/Makefile.am
+++ b/extensions/import/Makefile.am
@@ -8,16 +8,14 @@ extension_LTLIBRARIES = ldifimport-extension.la
 ldifimport_extension_la_LDFLAGS = \
        -avoid-version -module
 
-INCLUDES = \
+AM_CPPFLAGS = \
           -I${top_srcdir} \
           -I${top_srcdir}/src \
           -I$(top_srcdir)/src/dbus \
           -I${top_builddir} \
           @GLIB_CFLAGS@ \
-          @GTK_CFLAGS@
-
-AM_CPPFLAGS = \
-               -DG_LOG_DOMAIN=\"Claws-Contacts\"
+          @GTK_CFLAGS@ \
+          -DG_LOG_DOMAIN=\"Claws-Contacts\"
 
 ldifimport_extension_la_SOURCES = \
                    ldifimport_extension.c \

diff --git a/extensions/vcard/src/Makefile.am b/extensions/vcard/src/Makefile.am
index 8840bd01394fa6be828da6971057be299945df0a..2ad9a4ce3e30a82d66e723de7922f4376706d424 100644 (file)
--- a/extensions/vcard/src/Makefile.am
+++ b/extensions/vcard/src/Makefile.am
@@ -8,19 +8,16 @@ extension_LTLIBRARIES = vcard-extension.la
 vcard_extension_la_LDFLAGS = \
        -avoid-version -module
 
-INCLUDES = \
+AM_CPPFLAGS = \
           -I${top_srcdir} \
           -I${top_srcdir}/src \
           -I${top_srcdir}/src/dbus \
           -I${top_srcdir}/libversit \
           -I${top_builddir} \
           @GLIB_CFLAGS@ \
-          @GTK_CFLAGS@
-
-
-AM_CPPFLAGS = \
-               $(CLAWS_CONTACTS_CFLAGS) \
-               -DG_LOG_DOMAIN=\"Claws-Contacts\"
+          @GTK_CFLAGS@ \
+          $(CLAWS_CONTACTS_CFLAGS) \
+          -DG_LOG_DOMAIN=\"Claws-Contacts\"
 
 vcard_extension_la_SOURCES = \
                    vcard-extension.c

diff --git a/libversit/Makefile.am b/libversit/Makefile.am
index 085aa4f4c40550d40f8368c4da24cebb492989b3..ff307e72f5e8cd67da2b8365fc71ff851110fc37 100644 (file)
--- a/libversit/Makefile.am
+++ b/libversit/Makefile.am
@@ -11,14 +11,12 @@ libvcardinclude_HEADERS = \
                    vcard-utils.h \
                        vobject.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
           -I${top_srcdir}/src \
           -I${top_srcdir}/src/dbus \
           @GLIB_CFLAGS@ \
-          @GTK_CFLAGS@
-
-AM_CPPFLAGS = \
-               -DG_LOG_DOMAIN=\"Claws-Contacts\"
+          @GTK_CFLAGS@ \
+          -DG_LOG_DOMAIN=\"Claws-Contacts\"
 
 YACCFLAGS = \
            -d

diff --git a/plugins/example/src/Makefile.am b/plugins/example/src/Makefile.am
index 9150968b5eb7608a48c03c0fc5c17da11ef73dda..3eba4537a5256514f9b20a78bc1d00d2581d937e 100644 (file)
--- a/plugins/example/src/Makefile.am
+++ b/plugins/example/src/Makefile.am
@@ -8,17 +8,16 @@ plugin_LTLIBRARIES = example-plugin.la
 example_plugin_la_LDFLAGS = \
        -avoid-version -module
        
-INCLUDES = \
+AM_CPPFLAGS = \
           -I${top_srcdir} \
           -I${top_builddir} \
           @GLIB_CFLAGS@ \
-          @GTK_CFLAGS@
+          @GTK_CFLAGS@ \
+          $(CLAWS_CONTACTS_CFLAGS) \
+          -DG_LOG_DOMAIN=\"Claws-Contacts\"
 
 example_pluginincludedir= \
                $(includedir)/claws-contacts/plugins/@PACKAGE@
-AM_CPPFLAGS = \
-               $(CLAWS_CONTACTS_CFLAGS) \
-               -DG_LOG_DOMAIN=\"Claws-Contacts\"
 
 example_plugin_la_SOURCES = \
                example-plugin.c

diff --git a/plugins/ldap/Makefile.am b/plugins/ldap/Makefile.am
index 35be37d286f4e77d6d98f119edc6aa24068a31bd..ffb4090bbc1174d523544cf7dda9352d676d9936 100644 (file)
--- a/plugins/ldap/Makefile.am
+++ b/plugins/ldap/Makefile.am
@@ -8,18 +8,16 @@ plugin_LTLIBRARIES = ldap-plugin.la
 ldap_plugin_la_LDFLAGS = \
        -avoid-version -module
        
-INCLUDES = \
+AM_CPPFLAGS = \
           -I${top_srcdir} \
           -I${top_srcdir}/src \
           -I${top_builddir} \
           -I$(top_srcdir)/src/dbus \
           @GLIB_CFLAGS@ \
           @GTK_CFLAGS@ \
-          @GNUTLS_CFLAGS@
-
-AM_CPPFLAGS = \
-               -DG_LOG_DOMAIN=\"Claws-Contacts\" \
-               $(LIBGCRYPT_CFLAGS)
+          @GNUTLS_CFLAGS@ \
+          -DG_LOG_DOMAIN=\"Claws-Contacts\" \
+          $(LIBGCRYPT_CFLAGS)
 
 ldap_plugin_la_SOURCES = \
                ldap-plugin.c

diff --git a/plugins/xml/Makefile.am b/plugins/xml/Makefile.am
index 1fa402398cbdebcce85d1f1902fccebdbe3477c4..d954f4718cbbcc9fd62b13b6bbb538902268eb56 100644 (file)
--- a/plugins/xml/Makefile.am
+++ b/plugins/xml/Makefile.am
@@ -8,7 +8,7 @@ plugin_LTLIBRARIES = xml-plugin.la
 xml_plugin_la_LDFLAGS = \
        -avoid-version -module
 
-INCLUDES = \
+AM_CPPFLAGS = \
           -I${top_srcdir} \
           -I${top_srcdir}/src \
           -I$(top_srcdir)/src/dbus \
@@ -16,10 +16,8 @@ INCLUDES = \
           -I${top_srcdir}/xmllib \
           @GLIB_CFLAGS@ \
           @GTK_CFLAGS@ \
-          @LIBXML_CFLAGS@
-
-AM_CPPFLAGS = \
-               -DG_LOG_DOMAIN=\"Claws-Contacts\"
+          @LIBXML_CFLAGS@ \
+          -DG_LOG_DOMAIN=\"Claws-Contacts\"
 
 xml_plugin_la_SOURCES = \
                    xml-plugin.c \

diff --git a/src/Makefile.am b/src/Makefile.am
index 14b308df694dabed7207984a84d38191571d09a5..4c36b3dd3b5da6e55b08eef400d1849111595d20 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,20 +5,18 @@ SUBDIRS = dbus
 
 bin_PROGRAMS = claws-contacts
 
-INCLUDES = \
+AM_CPPFLAGS = \
           -I${top_srcdir} \
           -I${top_srcdir}/xmllib \
           -I${top_srcdir}/src/dbus \
           -I${top_builddir} \
           @GLIB_CFLAGS@ \
           @GTK_CFLAGS@ \
-          @LIBXML_CFLAGS@
-
-AM_CPPFLAGS = \
-               -DG_LOG_DOMAIN=\"Claws-Contacts\" \
-               -DPLUGINDIR=\"@PLUGINDIR@\" \
-               -DEXTENSIONDIR=\"@CLAWS_CONTACTS_EXTENSIONDIR@\" \
-               $(LIBGCRYPT_CFLAGS)
+          @LIBXML_CFLAGS@ \
+          -DG_LOG_DOMAIN=\"Claws-Contacts\" \
+          -DPLUGINDIR=\"@PLUGINDIR@\" \
+          -DEXTENSIONDIR=\"@CLAWS_CONTACTS_EXTENSIONDIR@\" \
+          $(LIBGCRYPT_CFLAGS)
 
 claws_contacts_SOURCES = \
                    claws-contacts.c \

diff --git a/src/dbus/Makefile.am b/src/dbus/Makefile.am
index 16bfffc86a4044dc490af6cf7550c99f4be26ba8..580312d4953966e8b07b90fe66f243630423a1c0 100644 (file)
--- a/src/dbus/Makefile.am
+++ b/src/dbus/Makefile.am
@@ -2,13 +2,14 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-INCLUDES = \
+AM_CPPFLAGS = \
           -I${top_srcdir} \
           -I${top_builddir} \
           -I${top_srcdir}/src \
           -I${top_srcdir}/libversit \
           @GLIB_CFLAGS@ \
-          @GTK_CFLAGS@
+          @GTK_CFLAGS@ \
+          -DG_LOG_DOMAIN=\"Claws-Contacts\"
 
 noinst_LTLIBRARIES = libdbus.la
 
@@ -31,9 +32,6 @@ noinst_HEADERS = \
 BUILT_SOURCES = \
                 server-bindings.h
 
-AM_CPPFLAGS = \
-               -DG_LOG_DOMAIN=\"Claws-Contacts\"
-
 libdbus_la_LIBADD = \
                   @GLIB_LIBS@ \
                   @GTK_LIBS@ \

diff --git a/xmllib/Makefile.am b/xmllib/Makefile.am
index 27be7186758298b7a7d328530f631b749ea57fcc..a8bf4d044f733f6effecbf4454cb32d23fe63302 100644 (file)
--- a/xmllib/Makefile.am
+++ b/xmllib/Makefile.am
@@ -7,17 +7,15 @@ libcontactxml_la_SOURCES = \
                                parser.h \
                                parser.c
                                
-INCLUDES = \
+AM_CPPFLAGS = \
           -I${top_srcdir} \
           -I${top_builddir} \
           -I$(top_srcdir)/src \
           -I$(top_srcdir)/src/dbus \
           @GLIB_CFLAGS@ \
           @GTK_CFLAGS@ \
-          @LIBXML_CFLAGS@
-
-AM_CPPFLAGS = \
-               -DG_LOG_DOMAIN=\"Claws-Contacts\"
+          @LIBXML_CFLAGS@ \
+          -DG_LOG_DOMAIN=\"Claws-Contacts\"
                
 libcontactxml_la_LIBADD= \
                   @GLIB_LIBS@ \