From 294eb28102b7b4d8fa6292676aece8ffa755a59d Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Tue, 23 Jul 2013 19:34:03 -0400 Subject: [PATCH] Fix automake warning about deprecated INCLUDES Warning was: src/Makefile.am:3: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') --- configure.ac | 3 +++ src/Makefile.am | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 91d8c2b..05a7974 100644 --- 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 f2bbdca..bde3b7b 100644 --- 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 -- 2.20.1