From f6df407699c60e60ff39f34b44bbcf76a8300c87 Mon Sep 17 00:00:00 2001 From: Jef Driesen Date: Thu, 27 Dec 2012 22:12:33 +0100 Subject: [PATCH] Reverse the order of the include directories. The version.h header file is generated by autoconf and therefore located in the build directory and not the source directory. If building out-of-tree, and a version.h header file is accidentally present in the source tree, the wrong file will be picked up. By reversing the order of the include directories, the build directory is searched first, and the correct header file will be used. --- examples/Makefile.am | 2 +- src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index ad9c4c0..efcbed5 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include LDADD = $(top_builddir)/src/libdivecomputer.la bin_PROGRAMS = \ diff --git a/src/Makefile.am b/src/Makefile.am index 628527d..dad3087 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include +AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include AM_CFLAGS = $(LIBUSB_CFLAGS) lib_LTLIBRARIES = libdivecomputer.la