Merge branch 'maint'

* maint:
  automake: refactoring: factor out common cpp-like flags

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --cc automake.in
index 5d0d86181c1e01daf6b91f9afb235c17becaae3e,751dc84ed992569814e55baeab77ea6a89eeefe4..4275b57ea0b3dcc35b350e3efef425005c44dc3e
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in
@@@ -600,6 -609,15 +600,14 @@@ sub initialize_per_input (
  
  # Initialize our list of languages that are internally supported.
  
 -    $(INCLUDES)
+ my @cpplike_flags =
+   qw{
+     $(DEFS)
+     $(DEFAULT_INCLUDES)
+     $(AM_CPPFLAGS)
+     $(CPPFLAGS)
+   };
+ 
  # C.
  register_language ('name' => 'c',
                   'Name' => 'C',