e: use AM_CPPFLAGS instead of INCLUDES

Get rid of warnings like below with recent automake (1.11 and newer): src/bin/Makefile.am:6: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') src/bin/Makefile.am: installing './depcomp' src/modules/access/Makefile.am:11: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') SVN revision: 78720
11 years ago · 92eee9068a
parent 8afe8dcff4
commit 92eee9068a
63 changed files with 67 additions and 68 deletions
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@ -3,7 +3,7 @@ SUBDIRS = e_fm
 MAINTAINERCLEANFILES = Makefile.in
 DISTCLEANFILES = e_fm_shared_types.h

-INCLUDES = \
+AM_CPPFLAGS = \
 -I$(top_builddir) \
 -I$(top_builddir)/src/bin \
 -I$(top_srcdir) \
@ -357,7 +357,7 @@ e_xsettings.c \
 e_zone.c \
 $(ENLIGHTENMENTHEADERS)

-enlightenment_CPPFLAGS = -DE_LOGGING=1
+enlightenment_CPPFLAGS = $(AM_CPPFLAGS) -DE_LOGGING=1
 enlightenment_SOURCES = \
 e_main.c \
 $(enlightenment_src)
@ -375,7 +375,7 @@ enlightenment_imc_LDADD = @E_IMC_LIBS@

 enlightenment_start_SOURCES = \
 e_start_main.c
-enlightenment_start_CFLAGS = $(INCLUDES) @E_START_CFLAGS@
+enlightenment_start_CFLAGS = $(AM_CPPFLAGS) @E_START_CFLAGS@
 enlightenment_start_LDADD = @dlopen_libs@ @E_START_LIBS@

 enlightenment_thumb_SOURCES = \
@ -389,7 +389,6 @@ enlightenment_fm_op_SOURCES = \
 e_fm_op.c

 enlightenment_fm_op_LDADD = @E_FM_OP_LIBS@
-enlightenment_fm_op_CFLAGS = $(INCLUDES)

 enlightenment_sys_SOURCES = \
 e_sys_main.c
--- a/src/modules/access/Makefile.am
+++ b/src/modules/access/Makefile.am
@ -8,7 +8,7 @@ files_DATA = module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/backlight/Makefile.am
+++ b/src/modules/backlight/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/battery/Makefile.am
+++ b/src/modules/battery/Makefile.am
@ -19,7 +19,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
@ -28,7 +28,7 @@ INCLUDES               = -I. \
                         @e_cflags@ \
                         @cf_cflags@
 if HAVE_ENOTIFY
-INCLUDES              += @ENOTIFY_CFLAGS@
+AM_CPPFLAGS              += @ENOTIFY_CFLAGS@
 endif

 pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
--- a/src/modules/clock/Makefile.am
+++ b/src/modules/clock/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/comp/Makefile.am
+++ b/src/modules/comp/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/conf/Makefile.am
+++ b/src/modules/conf/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/conf_applications/Makefile.am
+++ b/src/modules/conf_applications/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/conf_dialogs/Makefile.am
+++ b/src/modules/conf_dialogs/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/conf_display/Makefile.am
+++ b/src/modules/conf_display/Makefile.am
@ -9,7 +9,7 @@ module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/conf_edgebindings/Makefile.am
+++ b/src/modules/conf_edgebindings/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/conf_interaction/Makefile.am
+++ b/src/modules/conf_interaction/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/conf_intl/Makefile.am
+++ b/src/modules/conf_intl/Makefile.am
@ -8,7 +8,7 @@ files_DATA = module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/conf_keybindings/Makefile.am
+++ b/src/modules/conf_keybindings/Makefile.am
@ -9,7 +9,7 @@ module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/conf_menus/Makefile.am
+++ b/src/modules/conf_menus/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/conf_paths/Makefile.am
+++ b/src/modules/conf_paths/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/conf_performance/Makefile.am
+++ b/src/modules/conf_performance/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/conf_randr/Makefile.am
+++ b/src/modules/conf_randr/Makefile.am
@ -10,7 +10,7 @@ files_DATA = \
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/conf_shelves/Makefile.am
+++ b/src/modules/conf_shelves/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/conf_theme/Makefile.am
+++ b/src/modules/conf_theme/Makefile.am
@ -9,7 +9,7 @@ module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/conf_wallpaper2/Makefile.am
+++ b/src/modules/conf_wallpaper2/Makefile.am
@ -9,7 +9,7 @@ module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/conf_window_manipulation/Makefile.am
+++ b/src/modules/conf_window_manipulation/Makefile.am
@ -9,7 +9,7 @@ e-module-conf_winmanip.edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/conf_window_remembers/Makefile.am
+++ b/src/modules/conf_window_remembers/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/connman/Makefile.am
+++ b/src/modules/connman/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES          = -I. \
+AM_CPPFLAGS          = -I. \
                    -I$(top_srcdir) \
                    -I$(top_srcdir)/src/modules/$(MODULE) \
                    -I$(top_srcdir)/src/bin \
--- a/src/modules/cpufreq/Makefile.am
+++ b/src/modules/cpufreq/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/dropshadow/Makefile.am
+++ b/src/modules/dropshadow/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/everything/Makefile.am
+++ b/src/modules/everything/Makefile.am
@ -11,7 +11,7 @@ module.desktop
 EXTRA_DIST = $(files_DATA) everything.pc.in module.desktop.in

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/fileman/Makefile.am
+++ b/src/modules/fileman/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/fileman_opinfo/Makefile.am
+++ b/src/modules/fileman_opinfo/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/gadman/Makefile.am
+++ b/src/modules/gadman/Makefile.am
@ -8,7 +8,7 @@ files_DATA = e-module-gadman.edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/ibar/Makefile.am
+++ b/src/modules/ibar/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/ibox/Makefile.am
+++ b/src/modules/ibox/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/illume-bluetooth/Makefile.am
+++ b/src/modules/illume-bluetooth/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/illume-home-toggle/Makefile.am
+++ b/src/modules/illume-home-toggle/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/illume-home/Makefile.am
+++ b/src/modules/illume-home/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/illume-indicator/Makefile.am
+++ b/src/modules/illume-indicator/Makefile.am
@ -21,7 +21,7 @@ EXTRA_DIST = \
           module.desktop.in

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/illume-kbd-toggle/Makefile.am
+++ b/src/modules/illume-kbd-toggle/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/illume-keyboard/Makefile.am
+++ b/src/modules/illume-keyboard/Makefile.am
@ -22,7 +22,7 @@ EXTRA_DIST = \
             module.desktop.in

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/illume-mode-toggle/Makefile.am
+++ b/src/modules/illume-mode-toggle/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/illume-softkey/Makefile.am
+++ b/src/modules/illume-softkey/Makefile.am
@ -21,7 +21,7 @@ EXTRA_DIST = \
           module.desktop.in

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/illume2/Makefile.am
+++ b/src/modules/illume2/Makefile.am
@ -21,7 +21,7 @@ EXTRA_DIST = \
           module.desktop.in

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/illume2/policies/illume/Makefile.am
+++ b/src/modules/illume2/policies/illume/Makefile.am
@ -3,7 +3,7 @@ MODULE = illume2
 POLICY = illume

 # the module .so file
-INCLUDES = -I.. \
+AM_CPPFLAGS = -I.. \
           -I$(top_srcdir) \
           -I$(top_srcdir)/src/modules/$(MODULE) \
           -I$(top_srcdir)/src/modules/$(MODULE)/policies/$(POLICY) \
--- a/src/modules/illume2/policies/tablet/Makefile.am
+++ b/src/modules/illume2/policies/tablet/Makefile.am
@ -3,7 +3,7 @@ MODULE = illume2
 POLICY = tablet

 # the module .so file
-INCLUDES = -I.. \
+AM_CPPFLAGS = -I.. \
           -I$(top_srcdir) \
           -I$(top_srcdir)/src/modules/$(MODULE) \
           -I$(top_srcdir)/src/modules/$(MODULE)/policies/$(POLICY) \
--- a/src/modules/layout/Makefile.am
+++ b/src/modules/layout/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/mixer/Makefile.am
+++ b/src/modules/mixer/Makefile.am
@ -8,7 +8,7 @@ files_DATA = e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES          = -I. \
+AM_CPPFLAGS          = -I. \
                    -I$(top_srcdir) \
                    -I$(top_srcdir)/src/modules/$(MODULE) \
                    -I$(top_srcdir)/src/bin \
@ -16,7 +16,7 @@ INCLUDES          = -I. \
                    -I$(top_srcdir)/src/modules \
                    @e_cflags@ @SOUND_CFLAGS@
 if HAVE_ENOTIFY
-INCLUDES          += @ENOTIFY_CFLAGS@
+AM_CPPFLAGS          += @ENOTIFY_CFLAGS@
 endif

 pkgdir            = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
--- a/src/modules/msgbus/Makefile.am
+++ b/src/modules/msgbus/Makefile.am
@ -5,7 +5,7 @@ MODULE = msgbus
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/notification/Makefile.am
+++ b/src/modules/notification/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES          = -I. \
+AM_CPPFLAGS          = -I. \
                    -I$(top_srcdir) \
                    -I$(top_srcdir)/src/modules/$(MODULE) \
                    -I$(top_srcdir)/src/bin \
--- a/src/modules/pager/Makefile.am
+++ b/src/modules/pager/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/physics/Makefile.am
+++ b/src/modules/physics/Makefile.am
@ -8,7 +8,7 @@ files_DATA = e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/quickaccess/Makefile.am
+++ b/src/modules/quickaccess/Makefile.am
@ -8,7 +8,7 @@ files_DATA = e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/shot/Makefile.am
+++ b/src/modules/shot/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/start/Makefile.am
+++ b/src/modules/start/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/syscon/Makefile.am
+++ b/src/modules/syscon/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/systray/Makefile.am
+++ b/src/modules/systray/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/tasks/Makefile.am
+++ b/src/modules/tasks/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/temperature/Makefile.am
+++ b/src/modules/temperature/Makefile.am
@ -15,7 +15,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/tiling/Makefile.am
+++ b/src/modules/tiling/Makefile.am
@ -19,7 +19,7 @@ e-module-$(MODULE).edj:  e-module-$(MODULE).edc
 	$(top_builddir)/src/modules/$(MODULE)/e-module-$(MODULE).edj

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/winlist/Makefile.am
+++ b/src/modules/winlist/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/wizard/Makefile.am
+++ b/src/modules/wizard/Makefile.am
@ -26,7 +26,7 @@ data/desktop/tmp.desktop
 EXTRA_DIST = $(files_DATA) $(desks_DATA) $(favs_DATA) $(desktop_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \
--- a/src/modules/wl_drm/Makefile.am
+++ b/src/modules/wl_drm/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin/e_wayland \
--- a/src/modules/wl_screenshot/Makefile.am
+++ b/src/modules/wl_screenshot/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin/e_wayland \
--- a/src/modules/wl_shell/Makefile.am
+++ b/src/modules/wl_shell/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin/e_wayland \
--- a/src/modules/xkbswitch/Makefile.am
+++ b/src/modules/xkbswitch/Makefile.am
@ -9,7 +9,7 @@ e-module-$(MODULE).edj module.desktop
 EXTRA_DIST = $(files_DATA)

 # the module .so file
-INCLUDES               = -I. \
+AM_CPPFLAGS               = -I. \
                         -I$(top_srcdir) \
                         -I$(top_srcdir)/src/modules/$(MODULE) \
                         -I$(top_srcdir)/src/bin \