Fix automake warning about deprecated INCLUDES

Warning was:
    src/Makefile.am:3: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS'
    (or '*_CPPFLAGS')

diff --git a/configure.ac b/configure.ac
index 91d8c2bd5b765a6db79d3c9165f94fc98c5603c9..05a7974e69b3eb33844fb26e1203c8d9471feac8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,9 @@ dnl Testing the C compiler.
 AC_PROG_CC
 AC_LANG_C
 
+dnl For per-target flags
+AM_PROG_CC_C_O
+
 dnl Checking for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_PID_T

diff --git a/src/Makefile.am b/src/Makefile.am
index f2bbdcaa1ae5bbabf9be24690df2b3eed5e86e0c..bde3b7be63f8aeb2ac1db2eb26ec5a61d818410b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,15 +1,17 @@
 # This file is processed by GNU automake to generate Makefile.in
 
-INCLUDES = -I$(top_srcdir) \
-           -I$(top_srcdir)/pixmaps \
-           $(GTK_CFLAGS)
-
 bin_PROGRAMS = hvclock
 
 hvclock_SOURCES = hvclock.c hvclock.h clock.c clock.h \
                   options.c options.h dockapp.c dockapp.h \
                   common.h
 
+hvclock_CPPFLAGS = \
+    -I$(top_srcdir) \
+    -I$(top_srcdir)/pixmaps \
+    $(GTK_CFLAGS) \
+    $(AM_CPPFLAGS)
+
 hvclock_LDADD = $(GTK_LIBS)
 
 # These headers will be included in the distribution tarball, but will not be